diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
| commit | 3e68106afd95df012ddb548575f0133681687a90 (patch) | |
| tree | e2919b6900e6de13a3f52756acc02058a1ef0421 /pkgs/build-support/cc-wrapper | |
| parent | a73a28de7b16734d8e28da8be43a06b92eeb6bc3 (diff) | |
| parent | 25cc1c12febf74c66d661528e2fc2b00caff1bf1 (diff) | |
| download | nixlib-3e68106afd95df012ddb548575f0133681687a90.tar nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.gz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.bz2 nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.lz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.xz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.zst nixlib-3e68106afd95df012ddb548575f0133681687a90.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 1406dfd543da..8dbf2b8452bf 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -46,9 +46,9 @@ while [ $n -lt ${#params[*]} ]; do isCpp=1 elif [ "$p" = -nostdlib ]; then isCpp=-1 - elif [ "${i:0:1}" != - ]; then + elif [ "${p:0:1}" != - ]; then nonFlagArgs=1 - elif [ "$i" = -m32 ]; then + elif [ "$p" = -m32 ]; then if [ -e @out@/nix-support/dynamic-linker-m32 ]; then NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" fi |