Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-07 21:52:26 +00:00
parent a73a28de7b 25cc1c12fe
commit 3e68106afd
198 changed files with 32102 additions and 27617 deletions
@@ -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