···200 # don't support dynamic linking, but don't get the `staticMarker`.
201 # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
202 # has the `staticMarker`.
203- isStatic = final.isWasi || final.isRedox;
204205 # Just a guess, based on `system`
206 inherit
···200 # don't support dynamic linking, but don't get the `staticMarker`.
201 # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
202 # has the `staticMarker`.
203+ isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;
204205 # Just a guess, based on `system`
206 inherit
···14 overrideCC,
15 wrapCCWith,
16 wrapBintoolsWith,
017 buildLlvmTools, # tools, but from the previous stage, for cross
18 targetLlvmLibraries, # libraries, but from the next stage, for cross
19 targetLlvm,
···423 libcxx = null;
424 bintools = bintoolsNoLibc';
425 extraPackages = [ ];
426- extraBuildCommands =
427- lib.optionalString (lib.versions.major metadata.release_version == "13") ''
428- echo "-nostartfiles" >> $out/nix-support/cc-cflags
429- ''
430- + mkExtraBuildCommands0 cc;
431 }
432 // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
433- nixSupport.cc-cflags =
434- [ "-nostartfiles" ]
435- ++ lib.optional (
436- lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
437- ) "-fno-exceptions";
438 }
439 );
440···576 # Use clang due to "gnu::naked" not working on aarch64.
577 # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
578 stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
0000000579 };
580581 libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;
···14 overrideCC,
15 wrapCCWith,
16 wrapBintoolsWith,
17+ buildPackages,
18 buildLlvmTools, # tools, but from the previous stage, for cross
19 targetLlvmLibraries, # libraries, but from the next stage, for cross
20 targetLlvm,
···424 libcxx = null;
425 bintools = bintoolsNoLibc';
426 extraPackages = [ ];
427+ # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
428+ extraBuildCommands = mkExtraBuildCommands0 cc;
000429 }
430 // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
431+ # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
432+ nixSupport.cc-cflags = lib.optional (
433+ lib.versionAtLeast metadata.release_version "15" && stdenv.targetPlatform.isWasm
434+ ) "-fno-exceptions";
0435 }
436 );
437···573 # Use clang due to "gnu::naked" not working on aarch64.
574 # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
575 stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
576+ cmake =
577+ if stdenv.targetPlatform.libc == "llvm" then buildPackages.cmakeMinimal else buildPackages.cmake;
578+ python3 =
579+ if stdenv.targetPlatform.libc == "llvm" then
580+ buildPackages.python3Minimal
581+ else
582+ buildPackages.python3;
583 };
584585 libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;