diff options
| author | Eric Litak <elitak@gmail.com> | 2016-05-31 15:29:16 -0700 |
|---|---|---|
| committer | Eric Litak <elitak@gmail.com> | 2016-05-31 16:28:05 -0700 |
| commit | fa4fcaf6b46af3fb4f0273bb657f96223763ac86 (patch) | |
| tree | 601db0ed92e45c383b11afc525e16fc5baada61e | |
| parent | 89c9a8896b8b0793cdad1728c39e300bf10c5df7 (diff) | |
| download | nixlib-fa4fcaf6b46af3fb4f0273bb657f96223763ac86.tar nixlib-fa4fcaf6b46af3fb4f0273bb657f96223763ac86.tar.gz nixlib-fa4fcaf6b46af3fb4f0273bb657f96223763ac86.tar.bz2 nixlib-fa4fcaf6b46af3fb4f0273bb657f96223763ac86.tar.lz nixlib-fa4fcaf6b46af3fb4f0273bb657f96223763ac86.tar.xz nixlib-fa4fcaf6b46af3fb4f0273bb657f96223763ac86.tar.zst nixlib-fa4fcaf6b46af3fb4f0273bb657f96223763ac86.zip | |
darwin output paths
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index db8f6282b829..99b3de471fa3 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -164,8 +164,8 @@ let version = "4.8.5"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" - else " --with-headers=${libcCross}/include") + + (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" + else " --with-headers=${libcCross.dev}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 97bdeecb5a2d..5c3103008287 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -166,8 +166,8 @@ let version = "4.9.3"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" - else " --with-headers=${libcCross}/include") + + (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" + else " --with-headers=${libcCross.dev}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 2512e90ff03f..3c9d8772f612 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -165,8 +165,8 @@ let version = "5.3.0"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" - else " --with-headers=${libcCross}/include") + + (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" + else " --with-headers=${libcCross.dev}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index be99237bfdbc..d281488fd505 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -165,8 +165,8 @@ let version = "6.1.0"; " --disable-libatomic " + # libatomic requires libc " --disable-decimal-float" # libdecnumber requires libc else - (if crossDarwin then " --with-sysroot=${libcCross}/share/sysroot" - else " --with-headers=${libcCross}/include") + + (if crossDarwin then " --with-sysroot=${libcCross.out}/share/sysroot" + else " --with-headers=${libcCross.dev}/include") + # Ensure that -print-prog-name is able to find the correct programs. (stdenv.lib.optionalString (crossMingw || crossDarwin) ( " --with-as=${binutilsCross}/bin/${cross.config}-as" + |