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

Jump to bottom

Use array for rustflags to avoid conflicts with user flags #1548

Merged
merged 1 commit into from
Jan 18, 2024
Merged

Use array for rustflags to avoid conflicts with user flags #1548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
# to help locate python shared library in present working directory
[target.x86_64-unknown-linux-musl]
rustflags = "-C link-args=-Wl,-rpath,$ORIGIN"
rustflags = ["-C", "link-args=-Wl,-rpath,$ORIGIN"]
# linker = "x86_64-linux-musl-gcc"

[target.x86_64-unknown-linux-gnu]
rustflags = "-C link-args=-Wl,-rpath,$ORIGIN"
rustflags = ["-C", "link-args=-Wl,-rpath,$ORIGIN"]

[target.i686-unknown-linux-gnu]
rustflags = "-C link-args=-Wl,-rpath,$ORIGIN"
rustflags = ["-C", "link-args=-Wl,-rpath,$ORIGIN"]

[target.aarch64-unknown-linux-gnu]
rustflags = "-C link-args=-Wl,-rpath,$ORIGIN"
rustflags = ["-C", "link-args=-Wl,-rpath,$ORIGIN"]

[target.arm-unknown-linux-gnueabihf]
rustflags = "-C link-args=-Wl,-rpath,$ORIGIN"
rustflags = ["-C", "link-args=-Wl,-rpath,$ORIGIN"]

[target.arm-unknown-linux-musleabihf]
rustflags = "-C link-args=-Wl,-rpath,$ORIGIN"
rustflags = ["-C", "link-args=-Wl,-rpath,$ORIGIN"]

# to help locate python shared library in macOS in present working directory
# for x86_64-apple-darwin,we also turn on CPU optimization by default
# since there's only one kind of x86_64 CPU architecture for apple anyway
[target.x86_64-apple-darwin]
rustflags = "-C link-args=-Wl,-rpath,@loader_path -C target-cpu=native"
rustflags = ["-C", "link-args=-Wl,-rpath,@loader_path", "-C", "target-cpu=native"]

# sadly, we can't do the same for Apple Silicon, since GitHub's macOS action runners
# are still x86_64, and the Apple Silicon binary is cross-compiled using the
# macOS Intel runner
[target.aarch64-apple-darwin]
rustflags = "-C link-args=-Wl,-rpath,@loader_path"
rustflags = ["-C", "link-args=-Wl,-rpath,@loader_path"]