Merge branch 'master' into closure-size

2015-12-11 18:31:00 +01:00
parent 2f0fe05543 146784f835
commit 5b0352a6a4
577 changed files with 28738 additions and 7408 deletions
@@ -148,7 +148,7 @@ stdenv.mkDerivation {
    + optionalString (stdenv.isSunOS && nativePrefix != "") ''
      # Solaris needs an additional ld wrapper.
      ldPath="${nativePrefix}/bin"
-      ld="$out/bin/ld-solaris"
+      exec="$ldPath/ld"
      wrap ld-solaris ${./ld-solaris-wrapper.sh}
    '')