diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-08-09 21:37:29 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-08-09 21:37:29 +0200 |
| commit | d93c6367370f6acff76260308f4e7522a41c1c9e (patch) | |
| tree | 074b2b16ddf0b50c11fc4438c1883d741bb33f47 /pkgs/development/compilers/gcc/5 | |
| parent | 6225f1bf665c884f0a24f26b81f7c06355bf20cd (diff) | |
| download | nixlib-d93c6367370f6acff76260308f4e7522a41c1c9e.tar nixlib-d93c6367370f6acff76260308f4e7522a41c1c9e.tar.gz nixlib-d93c6367370f6acff76260308f4e7522a41c1c9e.tar.bz2 nixlib-d93c6367370f6acff76260308f4e7522a41c1c9e.tar.lz nixlib-d93c6367370f6acff76260308f4e7522a41c1c9e.tar.xz nixlib-d93c6367370f6acff76260308f4e7522a41c1c9e.tar.zst nixlib-d93c6367370f6acff76260308f4e7522a41c1c9e.zip | |
Revert "gcc: fix clang build"
This fixes the gcc build but results in a gcc that doesn't generate valid binaries. gcc -o hello hello.c ./hello Killed: 9 This reverts commit 2adf36ab8c7903e100e6e7a0a6447934ec09b10e.
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index c9780077835e..e95ef92c3f65 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -325,13 +325,7 @@ stdenv.mkDerivation ({ NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; - preConfigure = - # Not sure why this is causing problems, now that the stdenv - # exports CPP=cpp the build fails with strange errors on darwin. - # https://github.com/NixOS/nixpkgs/issues/27889 - stdenv.lib.optionalString stdenv.cc.isClang '' - unset CPP - '' + stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET" export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET" |