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

llvmPackages_*.clang: pick clangUseLLVM if targetPlatform.useLLVM

Browse Source 
libcxxClang still depends on cc wrapper's gccForLibs for libgcc which is
not available when useLLVM is set. In such cases we need to switch to
clangUseLLVM and (try) to use compiler-rt instead.

Resolves #153759: pkgsLLVM.llvmPackages.stdenv now correctly
clangUseLLVM as cc, allowing compilation to work as expected.
This commit is contained in:
sternenseemann 2022-01-07 12:58:21 +01:00
parent 766f5ffb76
commit e238f456b8
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/llvm/10/default.nix
View File

@ -91,8 +91,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/11/default.nix
View File

@ -106,8 +106,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/12/default.nix
View File

@ -94,8 +94,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/13/default.nix
View File

@ -95,8 +95,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/5/default.nix
View File

@ -67,8 +67,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/6/default.nix
View File

@ -68,8 +68,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/7/default.nix
View File

@ -98,8 +98,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/8/default.nix
View File

@ -99,8 +99,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/9/default.nix
View File

@ -99,8 +99,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {

4
pkgs/development/compilers/llvm/git/default.nix
View File

@ -95,8 +95,8 @@ let
# pick clang appropriate for package set we are targeting
clang =
if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU
then tools.libstdcxxClang
/**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM
else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang
else tools.libcxxClang;
libstdcxxClang = wrapCCWith rec {