From 4fc803884bc7c295b30c439619d6a67d083835f9 Mon Sep 17 00:00:00 2001 From: Titouan Bion Date: Mon, 2 Feb 2026 14:52:13 +0100 Subject: [PATCH 1/2] Propagate LDFLAGS, if present Ensures that when a toolchain is configured with `-fuse-ld` in its `LDFLAGS`, then `jemalloc-sys` selects the right linker. Behavior was observed when using Bazel with an LLVM toolchain. Signed-off-by: Titouan Bion --- jemalloc-sys/build.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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") From 96e8c809babf0ee602ac1a72c0aec0befbbae759 Mon Sep 17 00:00:00 2001 From: Titouan Bion Date: Mon, 2 Feb 2026 14:52:48 +0100 Subject: [PATCH 2/2] Upgrade from macos-13 to macos-15-intel `macos-13` has been deprecated and the CI is failing due to that, https://github.com/actions/runner-images/issues/13046 Signed-off-by: Titouan Bion --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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