chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

cc-wrapper: pass correct -B prefix

Browse Source
This commit is contained in:
Alba Mendez
2025-03-31 22:06:21 +02:00
committed by Alyssa Ross
parent 7b52c6fa13
commit 371a9fa6eb
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/add-flags.sh
View File

@@ -30,7 +30,7 @@ done
# Arocc does not support "-B"
if [[ -z "@isArocc@" ]]; then
# `-B@bintools@/bin' forces cc to use ld-wrapper.sh when calling ld.
NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/@bintools_targetPrefix@ $NIX_CFLAGS_COMPILE_@suffixSalt@"
fi
# Export and assign separately in order that a failing $(..) will fail

1
pkgs/build-support/cc-wrapper/default.nix
View File

@@ -872,6 +872,7 @@ stdenvNoCC.mkDerivation {
cc = optionalString (!nativeTools) cc;
wrapperName = "CC_WRAPPER";
inherit suffixSalt coreutils_bin bintools;
bintools_targetPrefix = bintools.targetPrefix;
inherit libc_bin libc_dev libc_lib;
inherit darwinPlatformForCC;
default_hardening_flags_str = builtins.toString defaultHardeningFlags;