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

Revert "cc-wrapper: fix set -u errors"

Browse Source 
This reverts commit 67a41eafe9.

see #28021 for discussion
This commit is contained in:
Robin Gloster 2017-08-08 10:20:00 +02:00
parent 67a41eafe9
commit 3e981b9e33
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/build-support/cc-wrapper/add-flags.sh
View File

@ -10,13 +10,12 @@ declare -a role_prefixes=()
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]]; then
role_prefixes+=(_BUILD)
fi
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]]; then
role_prefixes+=('')
fi
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]]; then
role_prefixes+=(_TARGET)
fi
# use this as default if no role is inferred
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" || ${#role_prefixes[@]} -eq 0 ]]; then
role_prefixes+=('')
fi
# For each role we serve, we accumulate the input parameters into our own
# cc-wrapper-derivation-specific environment variables.

5
pkgs/build-support/cc-wrapper/ld-wrapper.sh
View File

@ -20,11 +20,6 @@ fi
source @out@/nix-support/utils.sh
# make set -u happy if the outside environment is unset
# this should never happen, but does in an LLVM test
if [ -z "${NIX_STORE:-}" ]; then
NIX_STORE=/nix/store
fi
# Optionally filter out paths not refering to the store.
expandResponseParams "$@"