Skip to content

Propagate LDFLAGS if present #155

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

Merged
BusyJay merged 2 commits into from
Feb 5, 2026
Merged

Propagate LDFLAGS if present #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fc8038
Propagate LDFLAGS, if present
ArchangelX360 Feb 2, 2026
96e8c80
Upgrade from macos-13 to macos-15-intel
ArchangelX360 Feb 2, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion jemalloc-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,10 @@ fn main() {
.map(|s| s.to_str().unwrap())
.collect::<Vec<_>>()
.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");
Expand Down Expand Up @@ -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")
Expand Down