From 50dbc17490c848f61e274bea7e445ab4c6c7bb58 Mon Sep 17 00:00:00 2001 From: Dubiousjim Date: Mon, 7 Dec 2020 17:58:50 -0500 Subject: [PATCH] LIBSQLITE3_FLAGS for bundled -> SQLITE_FLAGS This flag was added in a9b700c but never documented. Here we change the name to more closely follow SQLITE_MAX_VARIABLE_NUMBER etc; and document its existence in README.md. --- README.md | 2 +- libsqlite3-sys/build.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 185cc8d..0397451 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ You can adjust this behavior in a number of ways: version = "0.24.2" features = ["bundled"] ``` -* When using the `bundled` feature, the build script will honor `SQLITE_MAX_VARIABLE_NUMBER` and `SQLITE_MAX_EXPR_DEPTH` variables. +* When using the `bundled` feature, the build script will honor `SQLITE_MAX_VARIABLE_NUMBER` and `SQLITE_MAX_EXPR_DEPTH` variables. It will also honor a `SQLITE_FLAGS` variable, which can have a format like `"-USQLITE_ALPHA -DSQLITE_BETA SQLITE_GAMMA ..."`. That would disable the `SQLITE_ALPHA` flag, and set the `SQLITE_BETA` and `SQLITE_GAMMA` flags. (The initial `-D` can be omitted, as on the last one.) * When linking against a SQLite library already on the system (so *not* using the `bundled` feature), you can set the `SQLITE3_LIB_DIR` environment variable to point to a directory containing the library. You can also set the `SQLITE3_INCLUDE_DIR` variable to point to the directory containing `sqlite3.h`. * Installing the sqlite3 development packages will usually be all that is required, but diff --git a/libsqlite3-sys/build.rs b/libsqlite3-sys/build.rs index cefcf25..1dde9bc 100644 --- a/libsqlite3-sys/build.rs +++ b/libsqlite3-sys/build.rs @@ -138,18 +138,18 @@ mod build_bundled { } println!("cargo:rerun-if-env-changed=SQLITE_MAX_EXPR_DEPTH"); - if let Ok(extras) = env::var("LIBSQLITE3_FLAGS") { + if let Ok(extras) = env::var("SQLITE_FLAGS") { for extra in extras.split_whitespace() { if extra.starts_with("-D") || extra.starts_with("-U") { cfg.flag(extra); } else if extra.starts_with("SQLITE_") { cfg.flag(&format!("-D{}", extra)); } else { - panic!("Don't understand {} in LIBSQLITE3_FLAGS", extra); + panic!("Don't understand {} in SQLITE_FLAGS", extra); } } } - println!("cargo:rerun-if-env-changed=LIBSQLITE3_FLAGS"); + println!("cargo:rerun-if-env-changed=SQLITE_FLAGS"); cfg.compile("libsqlite3.a");