From 67e86db39ea4c52733c8231269d0b3b529b89660 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 17 Jun 2020 20:33:56 +0000 Subject: 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) --- .../compilers/emscripten/fastcomp/emscripten-fastcomp.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'nixpkgs/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix') 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; { -- cgit 1.4.1