alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

ghc: move gcc-clang-wrapper.sh script into the ghc directory tree since it's the only user of that script

Browse source
This commit is contained in:
Peter Simons 2015-06-12 10:54:02 +02:00
parent 33e70ad68a
commit 85ae0cb070
7 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/ghc/7.0.4-binary.nix
View file

@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
configurePhase = '' configurePhase = ''
./configure --prefix=$out \ ./configure --prefix=$out \
--with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"} ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
''; '';
# Stripping combined with patchelf breaks the executables (they die # Stripping combined with patchelf breaks the executables (they die

2
pkgs/development/compilers/ghc/7.0.4.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS+=" -no_dtrace_dof" export NIX_LDFLAGS+=" -no_dtrace_dof"
''; '';
configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
else "--with-gcc=${stdenv.cc}/bin/gcc"; else "--with-gcc=${stdenv.cc}/bin/gcc";
NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

2
pkgs/development/compilers/ghc/7.2.2.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS+=" -no_dtrace_dof" export NIX_LDFLAGS+=" -no_dtrace_dof"
''; '';
configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
else "--with-gcc=${stdenv.cc}/bin/gcc"; else "--with-gcc=${stdenv.cc}/bin/gcc";
NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";

2
pkgs/development/compilers/ghc/7.4.2-binary.nix
View file

@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
configurePhase = '' configurePhase = ''
./configure --prefix=$out \ ./configure --prefix=$out \
--with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"} ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
''; '';
# Stripping combined with patchelf breaks the executables (they die # Stripping combined with patchelf breaks the executables (they die

2
pkgs/development/compilers/ghc/7.4.2.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
export NIX_LDFLAGS+=" -no_dtrace_dof" export NIX_LDFLAGS+=" -no_dtrace_dof"
''; '';
configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
else "--with-gcc=${stdenv.cc}/bin/gcc"; else "--with-gcc=${stdenv.cc}/bin/gcc";
# required, because otherwise all symbols from HSffi.o are stripped, and # required, because otherwise all symbols from HSffi.o are stripped, and

2
pkgs/development/compilers/ghc/7.6.3.nix
View file

@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
export NIX_LDFLAGS+=" -no_dtrace_dof" export NIX_LDFLAGS+=" -no_dtrace_dof"
''; '';
configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}"
else "--with-gcc=${stdenv.cc}/bin/gcc"; else "--with-gcc=${stdenv.cc}/bin/gcc";
postInstall = '' postInstall = ''

0
pkgs/development/haskell-modules/gcc-clang-wrapper.sh → pkgs/development/compilers/ghc/gcc-clang-wrapper.sh
View file