public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bintools-wrapper: Don't stop `set -u`-ing 

Same justification as previous commit.
This commit is contained in:
John Ericson 2019-10-29 19:44:44 -04:00
parent 43a98868ae
commit 545e7518a8
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/bintools-wrapper/default.nix
View File

@ -111,17 +111,13 @@ stdenv.mkDerivation {
installPhase = installPhase =
'' ''
set -u
mkdir -p $out/bin $out/nix-support mkdir -p $out/bin $out/nix-support
wrap() { wrap() {
local dst="$1" local dst="$1"
local wrapper="$2" local wrapper="$2"
export prog="$3" export prog="$3"
set +u
substituteAll "$wrapper" "$out/bin/$dst" substituteAll "$wrapper" "$out/bin/$dst"
set -u
chmod +x "$out/bin/$dst" chmod +x "$out/bin/$dst"
} }
'' ''
@ -163,8 +159,6 @@ stdenv.mkDerivation {
[[ -e "$underlying" ]] || continue [[ -e "$underlying" ]] || continue
wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying
done done
set +u
''; '';
emulation = let emulation = let
@ -307,7 +301,6 @@ stdenv.mkDerivation {
'' ''
+ '' + ''
set +u
substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash