|
|
|
@ -227,7 +227,7 @@ let |
|
|
|
|
|
|
|
|
|
compiler-rt-libc = callPackage ./compiler-rt { |
|
|
|
|
inherit llvm_meta; |
|
|
|
|
stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) |
|
|
|
|
stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.is32bit) |
|
|
|
|
then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc |
|
|
|
|
else stdenv; |
|
|
|
|
}; |
|
|
|
@ -240,7 +240,7 @@ let |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
# N.B. condition is safe because without useLLVM both are the same. |
|
|
|
|
compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) |
|
|
|
|
compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.libc == "newlib") |
|
|
|
|
then libraries.compiler-rt-libc |
|
|
|
|
else libraries.compiler-rt-no-libc; |
|
|
|
|
|
|
|
|
|