diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:53:18 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:53:18 +0100 |
commit | f5ce8f86dfa0a9f9dfe63462161f5ba982e57738 (patch) | |
tree | 051d54e5f5d5d1d0d9042e2b7f50bee36debb32f /pkgs/build-support/cc-wrapper | |
parent | b8f4df9d9e5ca70b6a873957e5b0899bb3b892dd (diff) | |
download | nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.gz nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.bz2 nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.lz nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.xz nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.zst nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.zip |
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc232422201c0364dbd57826c9a137cc1239caea, reversing changes made to 754816b84b98afdc0727e13dd66e1698b097de6a. We don't have many binaries yet. Comment on the original merge commit.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r-- | pkgs/build-support/cc-wrapper/utils.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index 9215fe2dc39..4b2b1380918 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -25,11 +25,7 @@ mangleVarBool() { for infix in "${role_infixes[@]}"; do local inputVar="${var/+/${infix}}" if [ -v "$inputVar" ]; then - # "1" in the end makes `let` return success error code when - # expression itself evaluates to zero. - # We don't use `|| true` because that would silence actual - # syntax errors from bad variable values. - let "${outputVar} |= ${!inputVar:-0}" "1" + let "${outputVar} |= ${!inputVar}" fi done } |