diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-17 20:33:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:27:42 +0000 |
commit | 67e86db39ea4c52733c8231269d0b3b529b89660 (patch) | |
tree | 41ecb8b4e11576fda7afc19f7e9c507ee214fb16 /nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix | |
parent | 559564159b47c7d308b178b237c90d51dc4b85e7 (diff) | |
download | nixlib-67e86db39ea4c52733c8231269d0b3b529b89660.tar nixlib-67e86db39ea4c52733c8231269d0b3b529b89660.tar.gz nixlib-67e86db39ea4c52733c8231269d0b3b529b89660.tar.bz2 nixlib-67e86db39ea4c52733c8231269d0b3b529b89660.tar.lz nixlib-67e86db39ea4c52733c8231269d0b3b529b89660.tar.xz nixlib-67e86db39ea4c52733c8231269d0b3b529b89660.tar.zst nixlib-67e86db39ea4c52733c8231269d0b3b529b89660.zip |
treewide: Get rid of `cc.gcc`
Instead, we have a new `gccForLibs`, which has the appropriate definition for e.g. avoiding `x86_32` linking problems. (cherry picked from commit 92f96f47b05543074e61f1879769d52aa3ddfe66)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index b74c5c7e9e45..f8f06e24f8ba 100644 --- a/nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/nixpkgs/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; { |