Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
@@ -23,19 +23,19 @@ envHooks+=(addCVars)
 # Note: these come *after* $out in the PATH (see setup.sh).

 if [ -n "@cc@" ]; then
-    addToSearchPath PATH @cc@/bin
+    addToSearchPath _PATH @cc@/bin
 fi

 if [ -n "@binutils_bin@" ]; then
-    addToSearchPath PATH @binutils_bin@/bin
+    addToSearchPath _PATH @binutils_bin@/bin
 fi

 if [ -n "@libc_bin@" ]; then
-    addToSearchPath PATH @libc_bin@/bin
+    addToSearchPath _PATH @libc_bin@/bin
 fi

 if [ -n "@coreutils_bin@" ]; then
-    addToSearchPath PATH @coreutils_bin@/bin
+    addToSearchPath _PATH @coreutils_bin@/bin
 fi

 if [ -z "$crossConfig" ]; then