diff options
Diffstat (limited to 'pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix')
-rw-r--r-- | pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index b74c5c7e9e4..f8f06e24f8b 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -1,9 +1,7 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, ... }: +{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, gccForLibs, ... }: let rev = emscriptenVersion; - haveGcc = stdenv.cc.isGNU || stdenv.cc.cc ? gcc; - gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "emscripten-fastcomp-${rev}"; @@ -35,16 +33,14 @@ stdenv.mkDerivation rec { #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" "-DLLVM_BUILD_TESTS=ON" "-DCLANG_INCLUDE_TESTS=ON" - ] ++ (stdenv.lib.optional (stdenv.isLinux && haveGcc) + ] ++ (stdenv.lib.optional stdenv.isLinux # necessary for clang to find crtend.o - "-DGCC_INSTALL_PREFIX=${gcc}" + "-DGCC_INSTALL_PREFIX=${gccForLibs}" ); enableParallelBuilding = true; passthru = { isClang = true; - } // stdenv.lib.optionalAttrs haveGcc { - inherit gcc; }; meta = with stdenv.lib; { |