diff options
author | Danny Wilson <danny@decube.net> | 2014-04-04 22:08:10 +0200 |
---|---|---|
committer | Danny Wilson <danny@prime.vc> | 2015-11-16 17:20:12 +0100 |
commit | 6a2b723a8b349ce38b064e7f948ea0c28eafd2e1 (patch) | |
tree | d17a548e5ab96fc9f9871374d20ea312e6c8eadb | |
parent | 450d6aff9c05b5deec58ab31cb8bf0521af89dfb (diff) | |
download | nixlib-6a2b723a8b349ce38b064e7f948ea0c28eafd2e1.tar nixlib-6a2b723a8b349ce38b064e7f948ea0c28eafd2e1.tar.gz nixlib-6a2b723a8b349ce38b064e7f948ea0c28eafd2e1.tar.bz2 nixlib-6a2b723a8b349ce38b064e7f948ea0c28eafd2e1.tar.lz nixlib-6a2b723a8b349ce38b064e7f948ea0c28eafd2e1.tar.xz nixlib-6a2b723a8b349ce38b064e7f948ea0c28eafd2e1.tar.zst nixlib-6a2b723a8b349ce38b064e7f948ea0c28eafd2e1.zip |
Fix build of gccgo-wrapper on Illumos.
When compiling GCC with NIX_ENFORCE_PURITY, linking libgcc fails because crti.o and friends aren't part of the nix store.
-rw-r--r-- | pkgs/build-support/gcc-wrapper-old/utils.sh | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/gcc-wrapper-old/utils.sh b/pkgs/build-support/gcc-wrapper-old/utils.sh index 753b3772e956..fa19f91bf5d2 100644 --- a/pkgs/build-support/gcc-wrapper-old/utils.sh +++ b/pkgs/build-support/gcc-wrapper-old/utils.sh @@ -14,6 +14,8 @@ badPath() { # the temporary build directory). if test "${p:0:1}" != "/"; then return 1; fi + @extraPathTests@ + # Otherwise, the path should refer to the store or some temporary # directory (including the build directory). test \ diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 22c4fc22c020..fd80f4ec8c5f 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -294,7 +294,6 @@ stdenv.mkDerivation ({ ++ (optional stdenv.isDarwin gnused) ; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lm -ldl"; preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8134b08f5f7b..329e28f0c20a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16,6 +16,7 @@ # outside of the store. Thus, GCC, GFortran, & co. must always look for # files in standard system directories (/usr/include, etc.) noSysDirs ? (system != "x86_64-freebsd" && system != "i686-freebsd" + && system != "x86_64-solaris" && system != "x86_64-kfreebsd-gnu") # More flags for the bootstrapping of stdenv. |