diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-04 19:57:14 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-04 19:57:14 -0500 |
| commit | fae8d2627db00bd07d0a80669be26648161c86c0 (patch) | |
| tree | 8e969ec3f367f35c1ef34d3edb33353fade9358b /pkgs/build-support | |
| parent | c5cf0099967e0f5011b9188d56de22c376465b88 (diff) | |
| download | nixlib-fae8d2627db00bd07d0a80669be26648161c86c0.tar nixlib-fae8d2627db00bd07d0a80669be26648161c86c0.tar.gz nixlib-fae8d2627db00bd07d0a80669be26648161c86c0.tar.bz2 nixlib-fae8d2627db00bd07d0a80669be26648161c86c0.tar.lz nixlib-fae8d2627db00bd07d0a80669be26648161c86c0.tar.xz nixlib-fae8d2627db00bd07d0a80669be26648161c86c0.tar.zst nixlib-fae8d2627db00bd07d0a80669be26648161c86c0.zip | |
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/setup-hook.sh | 3 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 3 |
4 files changed, 1 insertions, 15 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 9f5395b635e0..4a56f00db49e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -199,11 +199,7 @@ stdenv.mkDerivation { ]; postFixup = - '' - set -u - '' - - + optionalString (libc != null) ('' + optionalString (libc != null) ('' ## ## General libc support ## diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 2e15fa95c794..a714bd151c90 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -2,8 +2,6 @@ # # See comments in cc-wrapper's setup hook. This works exactly the same way. -set -u - # Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a # native compile. # @@ -73,4 +71,3 @@ export NIX_HARDENING_ENABLE # No local scope in sourced file unset -v role_pre role_post cmd upper_case -set +u diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index cf2d38cd9978..d6037552ef6e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -134,8 +134,6 @@ stdenv.mkDerivation { installPhase = '' - set -u - mkdir -p $out/bin $out/nix-support wrap() { @@ -224,8 +222,6 @@ stdenv.mkDerivation { postFixup = '' - set -u - # Backwards compatability for packages expecting this file, e.g. with # `$NIX_CC/nix-support/dynamic-linker`. # diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 211b50632914..5b13f2683097 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -54,8 +54,6 @@ # For more details, read the individual files where the mechanisms used to # accomplish this will be individually documented. -set -u - # Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a # native compile. # @@ -120,4 +118,3 @@ export NIX_HARDENING_ENABLE # No local scope in sourced file unset -v role_pre role_post -set +u |