pyrox.dev
Revert "cc-wrapper: fix set -u errors"
This reverts commit 67a41eafe9c92269c9f6788f5f54a4b0d282cb96.
see #28021 for discussion
+3
-4
pkgs/build-support/cc-wrapper/add-flags.sh
+3
-4
pkgs/build-support/cc-wrapper/add-flags.sh
···
10
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]]; then
11
role_prefixes+=(_BUILD)
12
fi
13
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]]; then
14
role_prefixes+=(_TARGET)
15
-
fi
16
-
# use this as default if no role is inferred
17
-
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" || ${#role_prefixes[@]} -eq 0 ]]; then
18
-
role_prefixes+=('')
19
fi
20
21
# For each role we serve, we accumulate the input parameters into our own
···
10
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]]; then
11
role_prefixes+=(_BUILD)
12
fi
13
+
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]]; then
14
+
role_prefixes+=('')
15
+
fi
16
if [[ -n "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]]; then
17
role_prefixes+=(_TARGET)
18
fi
19
20
# For each role we serve, we accumulate the input parameters into our own
-5
pkgs/build-support/cc-wrapper/ld-wrapper.sh
-5
pkgs/build-support/cc-wrapper/ld-wrapper.sh
···
20
21
source @out@/nix-support/utils.sh
22
23
-
# make set -u happy if the outside environment is unset
24
-
# this should never happen, but does in an LLVM test
25
-
if [ -z "${NIX_STORE:-}" ]; then
26
-
NIX_STORE=/nix/store
27
-
fi
28
29
# Optionally filter out paths not refering to the store.
30
expandResponseParams "$@"