From 1912736a861458773b164f581899059a446ff4ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Jan 2015 23:56:13 +0100 Subject: [PATCH] ghc-7.8.4: re-implement "fix build on Darwin" to avoid re-builds on Linux Originally, I thought that I can commit a "clean" patch -- even if it triggers re-builds -- because those re-builds were triggered by the ncurses patch to GHC anyway . That patch had to be reverted, though, so now I'm rewriting this patch to avoid re-builds on Linux. What a mess. :-( --- pkgs/development/compilers/ghc/7.4.2-binary.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 9fd1f038e7c..8dc585e7cda 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -62,9 +62,8 @@ stdenv.mkDerivation rec { '' else ""); configurePhase = '' - ./configure --prefix=$out \ - --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ - ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} + ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ + ${if stdenv.isDarwin then "--with-gcc=${./gcc-clang-wrapper.sh}" else "--with-clang"} ''; # Stripping combined with patchelf breaks the executables (they die