mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 16:15:05 +00:00
7869d16545
Also begin to start work on cross compilation, though that will have to
be finished later.
The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.
Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.
----
Other misc notes, highly incomplete
- lvm-config-native and llvm-config are put in `dev` because they are
tools just for build time.
- Clang no longer has an lld dep. That was introduced in
db29857eb3, but if clang needs help
finding lld when it is used we should just pass it flags / put in the
resource dir. Providing it at build time increases critical path
length for no good reason.
----
A note on `nativeCC`:
`stdenv` takes tools from the previous stage, so:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`
while:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
17 lines
558 B
Diff
17 lines
558 B
Diff
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
|
|
index 15497d405e0..33f7f18193a 100644
|
|
--- a/cmake/modules/HandleLLVMOptions.cmake
|
|
+++ b/cmake/modules/HandleLLVMOptions.cmake
|
|
@@ -127,7 +127,10 @@ else(WIN32)
|
|
set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
|
|
endif()
|
|
else(FUCHSIA OR UNIX)
|
|
- MESSAGE(SEND_ERROR "Unable to determine platform")
|
|
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi")
|
|
+ else()
|
|
+ MESSAGE(SEND_ERROR "Unable to determine platform")
|
|
+ endif()
|
|
endif(FUCHSIA OR UNIX)
|
|
endif(WIN32)
|
|
|