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.

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 9215fe2dc397..4b2b13809181 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
 }