diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3e2236cc4..c35abd243 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,7 @@ jobs: target: x86_64-apple-darwin nobgt: 0 no_tests: 1 - tag: macos-13 + tag: macos-15-intel - name: x86_64-unknown-linux-gnu (nightly) target: x86_64-unknown-linux-gnu nobgt: 0 diff --git a/jemalloc-sys/build.rs b/jemalloc-sys/build.rs index 4ed46a530..3841d6bb6 100644 --- a/jemalloc-sys/build.rs +++ b/jemalloc-sys/build.rs @@ -160,8 +160,10 @@ fn main() { .map(|s| s.to_str().unwrap()) .collect::>() .join(" "); + let ldflags = read_and_watch_env("LDFLAGS").unwrap_or_else(|_| cflags.clone()); info!("CC={:?}", compiler.path()); info!("CFLAGS={:?}", cflags); + info!("LDFLAGS={:?}", ldflags); assert!(out_dir.exists(), "OUT_DIR does not exist"); let jemalloc_repo_dir = PathBuf::from("jemalloc"); @@ -197,7 +199,7 @@ fn main() { .current_dir(&build_dir) .env("CC", compiler.path()) .env("CFLAGS", cflags.clone()) - .env("LDFLAGS", cflags.clone()) + .env("LDFLAGS", ldflags.clone()) .env("CPPFLAGS", cflags) .arg(format!("--with-version={je_version}")) .arg("--disable-cxx")