JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

darwin output paths

Browse Source
This commit is contained in:
Eric Litak 2016-05-31 15:29:16 -07:00
parent 89c9a8896b
commit fa4fcaf6b4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -164,8 +164,8 @@ let version = "4.8.5";
" --disable-libatomic " + # libatomic requires libc " --disable-libatomic " + # libatomic requires libc
" --disable-decimal-float" # libdecnumber requires libc " --disable-decimal-float" # libdecnumber requires libc
else else
(if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
else " --with-headers=${libcCross}/include") + else " --with-headers=${libcCross.dev}/include") +
# Ensure that -print-prog-name is able to find the correct programs. # Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) ( (stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" + " --with-as=${binutilsCross}/bin/${cross.config}-as" +

4
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -166,8 +166,8 @@ let version = "4.9.3";
" --disable-libatomic " + # libatomic requires libc " --disable-libatomic " + # libatomic requires libc
" --disable-decimal-float" # libdecnumber requires libc " --disable-decimal-float" # libdecnumber requires libc
else else
(if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
else " --with-headers=${libcCross}/include") + else " --with-headers=${libcCross.dev}/include") +
# Ensure that -print-prog-name is able to find the correct programs. # Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) ( (stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" + " --with-as=${binutilsCross}/bin/${cross.config}-as" +

4
pkgs/development/compilers/gcc/5/default.nix
View File

@ -165,8 +165,8 @@ let version = "5.3.0";
" --disable-libatomic " + # libatomic requires libc " --disable-libatomic " + # libatomic requires libc
" --disable-decimal-float" # libdecnumber requires libc " --disable-decimal-float" # libdecnumber requires libc
else else
(if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
else " --with-headers=${libcCross}/include") + else " --with-headers=${libcCross.dev}/include") +
# Ensure that -print-prog-name is able to find the correct programs. # Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) ( (stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" + " --with-as=${binutilsCross}/bin/${cross.config}-as" +

4
pkgs/development/compilers/gcc/6/default.nix
View File

@ -165,8 +165,8 @@ let version = "6.1.0";
" --disable-libatomic " + # libatomic requires libc " --disable-libatomic " + # libatomic requires libc
" --disable-decimal-float" # libdecnumber requires libc " --disable-decimal-float" # libdecnumber requires libc
else else
(if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot"
else " --with-headers=${libcCross}/include") + else " --with-headers=${libcCross.dev}/include") +
# Ensure that -print-prog-name is able to find the correct programs. # Ensure that -print-prog-name is able to find the correct programs.
(stdenv.lib.optionalString (crossMingw || crossDarwin) ( (stdenv.lib.optionalString (crossMingw || crossDarwin) (
" --with-as=${binutilsCross}/bin/${cross.config}-as" + " --with-as=${binutilsCross}/bin/${cross.config}-as" +