-
Notifications
You must be signed in to change notification settings - Fork 225
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update sqlcipher linkage hack to appease Rust 1.50 (fixes SYNC-1999)
- Loading branch information
Showing
2 changed files
with
16 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,13 @@ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
//! Work around the fact that `sqlcipher` might get enabled by a cargo feature | ||
//! another crate in the workspace needs, without setting up nss. (This is a | ||
//! gross hack). | ||
|
||
fn main() { | ||
println!("cargo:rerun-if-changed=build.rs"); | ||
// Ugh. This is really really dumb. We don't care about sqlcipher at all. really | ||
if nss_build_common::env_str("DEP_SQLITE3_LINK_TARGET") == Some("sqlcipher".into()) { | ||
// If NSS_DIR isn't set, we don't really care, ignore the Err case. | ||
let _ = nss_build_common::link_nss(); | ||
} | ||
} | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
//! Work around the fact that `sqlcipher` might get enabled by a cargo feature | ||
//! another crate in the workspace needs, without setting up nss. (This is a | ||
//! gross hack). | ||
fn main() { | ||
println!("cargo:rerun-if-changed=build.rs"); | ||
|
||
// If NSS_DIR isn't set, we don't really care, ignore the Err case. | ||
let _ = nss_build_common::link_nss(); | ||
} |