From 545e7518a808081261a6331c19ec9c5cffea4a81 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 29 Oct 2019 19:44:44 -0400 Subject: bintools-wrapper: Don't stop `set -u`-ing Same justification as previous commit. --- pkgs/build-support/bintools-wrapper/default.nix | 7 ------- 1 file changed, 7 deletions(-) (limited to 'pkgs/build-support/bintools-wrapper') diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index e02e77de45e..9f5395b635e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -111,17 +111,13 @@ stdenv.mkDerivation { installPhase = '' - set -u - mkdir -p $out/bin $out/nix-support wrap() { local dst="$1" local wrapper="$2" export prog="$3" - set +u substituteAll "$wrapper" "$out/bin/$dst" - set -u chmod +x "$out/bin/$dst" } '' @@ -163,8 +159,6 @@ stdenv.mkDerivation { [[ -e "$underlying" ]] || continue wrap ${targetPrefix}$variant ${./ld-wrapper.sh} $underlying done - - set +u ''; emulation = let @@ -307,7 +301,6 @@ stdenv.mkDerivation { '' + '' - set +u substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash -- cgit 1.4.1