mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
bintools-wrapper: fix late‐bound command references (#351531)
This commit is contained in:
commit
9a18caa5cd
@ -394,6 +394,8 @@ stdenvNoCC.mkDerivation {
|
|||||||
# TODO(@sternenseemann): rename env var via stdenv rebuild
|
# TODO(@sternenseemann): rename env var via stdenv rebuild
|
||||||
shell = (getBin runtimeShell + runtimeShell.shellPath or "");
|
shell = (getBin runtimeShell + runtimeShell.shellPath or "");
|
||||||
gnugrep_bin = optionalString (!nativeTools) gnugrep;
|
gnugrep_bin = optionalString (!nativeTools) gnugrep;
|
||||||
|
rm = if nativeTools then "rm" else lib.getExe' coreutils "rm";
|
||||||
|
mktemp = if nativeTools then "mktemp" else lib.getExe' coreutils "mktemp";
|
||||||
wrapperName = "BINTOOLS_WRAPPER";
|
wrapperName = "BINTOOLS_WRAPPER";
|
||||||
inherit dynamicLinker targetPrefix suffixSalt coreutils_bin;
|
inherit dynamicLinker targetPrefix suffixSalt coreutils_bin;
|
||||||
inherit bintools_bin libc_bin libc_dev libc_lib;
|
inherit bintools_bin libc_bin libc_dev libc_lib;
|
||||||
|
@ -253,8 +253,8 @@ PATH="$path_backup"
|
|||||||
# Old bash workaround, see above.
|
# Old bash workaround, see above.
|
||||||
|
|
||||||
if (( "${NIX_LD_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
|
if (( "${NIX_LD_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
|
||||||
responseFile=$(mktemp "${TMPDIR:-/tmp}/ld-params.XXXXXX")
|
responseFile=$(@mktemp@ "${TMPDIR:-/tmp}/ld-params.XXXXXX")
|
||||||
trap 'rm -f -- "$responseFile"' EXIT
|
trap '@rm@ -f -- "$responseFile"' EXIT
|
||||||
printf "%q\n" \
|
printf "%q\n" \
|
||||||
${extraBefore+"${extraBefore[@]}"} \
|
${extraBefore+"${extraBefore[@]}"} \
|
||||||
${params+"${params[@]}"} \
|
${params+"${params[@]}"} \
|
||||||
|
@ -131,8 +131,8 @@ in stdenv.mkDerivation {
|
|||||||
ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers
|
ASAN_OPTIONS=use_sigaltstack=0 ${emulator} ./sanitizers
|
||||||
''}
|
''}
|
||||||
|
|
||||||
echo "Check whether CC with NIX_CC_USE_RESPONSE_FILE hardcodes all required binaries..." >&2
|
echo "Check whether CC and LD with NIX_X_USE_RESPONSE_FILE hardcodes all required binaries..." >&2
|
||||||
NIX_CC_USE_RESPONSE_FILE=1 ${CC} -v
|
NIX_CC_USE_RESPONSE_FILE=1 NIX_LD_USE_RESPONSE_FILE=1 ${CC} -v
|
||||||
|
|
||||||
touch $out
|
touch $out
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user