Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RTE-294] Specify install directory libraries #379

Merged
merged 2 commits into from
Jan 13, 2025
Merged

[RTE-294] Specify install directory libraries #379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4adb197
Bugfix: Ensure lib directory is used on all platforms
raoulstrackx Jan 10, 2025
5612d7d
Use constant for the installation dir
raoulstrackx Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion mbedtls-sys/build/cmake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

impl super::BuildConfig {
pub fn cmake(&self) {
static INSTALL_DIR: &str = "lib";

let mut cmk = cmake::Config::new(&self.mbedtls_src);
cmk.cflag(format!(
r#"-DMBEDTLS_CONFIG_FILE="\"{}\"""#,
Expand All @@ -19,6 +21,8 @@ impl super::BuildConfig {
.define("GEN_FILES", "ON")
// Prefer unix-style over Apple-style Python3 on macOS, required for the Github Actions CI
.define("Python3_FIND_FRAMEWORK", "LAST")
// Ensure same installation directory is used on all platforms
.define("LIB_INSTALL_DIR", INSTALL_DIR)
.build_target("install");
for cflag in &self.cflags {
cmk.cflag(cflag);
Expand Down Expand Up @@ -50,7 +54,7 @@ impl super::BuildConfig {

println!(
"cargo:rustc-link-search=native={}",
dst.join("lib").to_str().expect("link-search UTF-8 error")
dst.join(INSTALL_DIR).to_str().expect("link-search UTF-8 error")
);

println!("cargo:rustc-link-lib=static=mbedtls");
Expand Down
Loading