forked from mirrors/nixpkgs
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)`
24 lines
709 B
Diff
24 lines
709 B
Diff
diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
|
|
index 3a66dd9c3fb..7efc85d9f9f 100644
|
|
--- a/lib/builtins/CMakeLists.txt
|
|
+++ b/lib/builtins/CMakeLists.txt
|
|
@@ -301,6 +301,10 @@ if (NOT MSVC)
|
|
i386/umoddi3.S
|
|
)
|
|
|
|
+ set(i486_SOURCES ${i386_SOURCES})
|
|
+ set(i586_SOURCES ${i386_SOURCES})
|
|
+ set(i686_SOURCES ${i386_SOURCES})
|
|
+
|
|
if (WIN32)
|
|
set(i386_SOURCES
|
|
${i386_SOURCES}
|
|
@@ -608,6 +612,7 @@ else ()
|
|
endif()
|
|
|
|
foreach (arch ${BUILTIN_SUPPORTED_ARCH})
|
|
+ message("arch: ${arch}")
|
|
if (CAN_TARGET_${arch})
|
|
# For ARM archs, exclude any VFP builtins if VFP is not supported
|
|
if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
|