Commit 2839c94f authored by Alyssa Ross's avatar Alyssa Ross
Browse files

pkgsLLVM.stdenv: use clangNoLibc when libc is null 

clangNoLibc always uses LLVM bintools, so it still has the useLLVM
semantics.
parent e5d1511d

pkgs/development/compilers/llvm/10/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ let 


    # pick clang appropriate for package set we are targeting

    clang =

      /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc

      else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang

      else tools.libcxxClang;

pkgs/development/compilers/llvm/11/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ let 


    # pick clang appropriate for package set we are targeting

    clang =

      /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc

      else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang

      else tools.libcxxClang;

pkgs/development/compilers/llvm/12/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ let 


    # pick clang appropriate for package set we are targeting

    clang =

      /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc

      else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang

      else tools.libcxxClang;

pkgs/development/compilers/llvm/13/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ let 


    # pick clang appropriate for package set we are targeting

    clang =

      /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc

      else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang

      else tools.libcxxClang;

pkgs/development/compilers/llvm/14/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ let 


    # pick clang appropriate for package set we are targeting

    clang =

      /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc

      else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM

      else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang

      else tools.libcxxClang;