pyrox.dev / nixpkgs
lol
fork atom

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

Peter Simons 85ae0cb0 33e70ad6

+6 -6
unified split
+1 -1
pkgs/development/compilers/ghc/7.0.4-binary.nix
··· 90 configurePhase = '' 91 ./configure --prefix=$out \ 92 --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ 93 - ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"} 94 ''; 95 96 # Stripping combined with patchelf breaks the executables (they die
··· 90 configurePhase = '' 91 ./configure --prefix=$out \ 92 --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ 93 + ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} 94 ''; 95 96 # Stripping combined with patchelf breaks the executables (they die
+1 -1
pkgs/development/compilers/ghc/7.0.4.nix
··· 33 export NIX_LDFLAGS+=" -no_dtrace_dof" 34 ''; 35 36 - configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" 37 else "--with-gcc=${stdenv.cc}/bin/gcc"; 38 39 NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
··· 33 export NIX_LDFLAGS+=" -no_dtrace_dof" 34 ''; 35 36 + configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" 37 else "--with-gcc=${stdenv.cc}/bin/gcc"; 38 39 NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
+1 -1
pkgs/development/compilers/ghc/7.2.2.nix
··· 33 export NIX_LDFLAGS+=" -no_dtrace_dof" 34 ''; 35 36 - configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" 37 else "--with-gcc=${stdenv.cc}/bin/gcc"; 38 39 NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
··· 33 export NIX_LDFLAGS+=" -no_dtrace_dof" 34 ''; 35 36 + configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" 37 else "--with-gcc=${stdenv.cc}/bin/gcc"; 38 39 NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
+1 -1
pkgs/development/compilers/ghc/7.4.2-binary.nix
··· 90 configurePhase = '' 91 ./configure --prefix=$out \ 92 --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ 93 - ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}"} 94 ''; 95 96 # Stripping combined with patchelf breaks the executables (they die
··· 90 configurePhase = '' 91 ./configure --prefix=$out \ 92 --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ 93 + ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} 94 ''; 95 96 # Stripping combined with patchelf breaks the executables (they die
+1 -1
pkgs/development/compilers/ghc/7.4.2.nix
··· 36 export NIX_LDFLAGS+=" -no_dtrace_dof" 37 ''; 38 39 - configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" 40 else "--with-gcc=${stdenv.cc}/bin/gcc"; 41 42 # required, because otherwise all symbols from HSffi.o are stripped, and
··· 36 export NIX_LDFLAGS+=" -no_dtrace_dof" 37 ''; 38 39 + configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" 40 else "--with-gcc=${stdenv.cc}/bin/gcc"; 41 42 # required, because otherwise all symbols from HSffi.o are stripped, and
+1 -1
pkgs/development/compilers/ghc/7.6.3.nix
··· 52 export NIX_LDFLAGS+=" -no_dtrace_dof" 53 ''; 54 55 - configureFlags = if stdenv.isDarwin then "--with-gcc=${../../haskell-modules/gcc-clang-wrapper.sh}" 56 else "--with-gcc=${stdenv.cc}/bin/gcc"; 57 58 postInstall = ''
··· 52 export NIX_LDFLAGS+=" -no_dtrace_dof" 53 ''; 54 55 + configureFlags = if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" 56 else "--with-gcc=${stdenv.cc}/bin/gcc"; 57 58 postInstall = ''
pkgs/development/haskell-modules/gcc-clang-wrapper.sh pkgs/development/compilers/ghc/gcc-clang-wrapper.sh