ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

cc-wrapper, bintools-wrapper: Remove now unneeded set {+,-}u

Browse Source
This commit is contained in:
John Ericson 2019-11-04 19:57:14 -05:00
parent c5cf009996
commit fae8d2627d
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,11 +199,7 @@ stdenv.mkDerivation {
]; ];
postFixup = postFixup =
'' optionalString (libc != null) (''
set -u
''
+ optionalString (libc != null) (''
## ##
## General libc support ## General libc support
## ##

3
pkgs/build-support/bintools-wrapper/setup-hook.sh
View File

@ -2,8 +2,6 @@
# #
# See comments in cc-wrapper's setup hook. This works exactly the same way. # 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 # Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a
# native compile. # native compile.
# #
@ -73,4 +71,3 @@ export NIX_HARDENING_ENABLE
# No local scope in sourced file # No local scope in sourced file
unset -v role_pre role_post cmd upper_case unset -v role_pre role_post cmd upper_case
set +u

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

@ -134,8 +134,6 @@ stdenv.mkDerivation {
installPhase = installPhase =
'' ''
set -u
mkdir -p $out/bin $out/nix-support mkdir -p $out/bin $out/nix-support
wrap() { wrap() {
@ -224,8 +222,6 @@ stdenv.mkDerivation {
postFixup = postFixup =
'' ''
set -u
# Backwards compatability for packages expecting this file, e.g. with # Backwards compatability for packages expecting this file, e.g. with
# `$NIX_CC/nix-support/dynamic-linker`. # `$NIX_CC/nix-support/dynamic-linker`.
# #

3
pkgs/build-support/cc-wrapper/setup-hook.sh
View File

@ -54,8 +54,6 @@
# For more details, read the individual files where the mechanisms used to # For more details, read the individual files where the mechanisms used to
# accomplish this will be individually documented. # accomplish this will be individually documented.
set -u
# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a # Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a
# native compile. # native compile.
# #
@ -120,4 +118,3 @@ export NIX_HARDENING_ENABLE
# No local scope in sourced file # No local scope in sourced file
unset -v role_pre role_post unset -v role_pre role_post
set +u