public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emscripten: Don't always clain to have a GCC

Browse Source
This commit is contained in:
John Ericson 2020-06-22 00:16:32 -04:00
parent 2c91b4358a
commit e00d4d6021
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix
View File

@ -2,6 +2,7 @@
let let
rev = emscriptenVersion; rev = emscriptenVersion;
haveGcc = stdenv.cc.isGNU || stdenv.cc.cc ? gcc;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
#"-DLLVM_CONFIG=${llvm}/bin/llvm-config" #"-DLLVM_CONFIG=${llvm}/bin/llvm-config"
"-DLLVM_BUILD_TESTS=ON" "-DLLVM_BUILD_TESTS=ON"
"-DCLANG_INCLUDE_TESTS=ON" "-DCLANG_INCLUDE_TESTS=ON"
] ++ (stdenv.lib.optional stdenv.isLinux ] ++ (stdenv.lib.optional (stdenv.isLinux && haveGcc)
# necessary for clang to find crtend.o # necessary for clang to find crtend.o
"-DGCC_INSTALL_PREFIX=${gcc}" "-DGCC_INSTALL_PREFIX=${gcc}"
); );
@ -42,6 +43,7 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
isClang = true; isClang = true;
} // stdenv.lib.optionalAttrs haveGcc {
inherit gcc; inherit gcc;
}; };