mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-14 01:33:10 +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)`
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001
|
|
From: Will Dietz <w@wdtz.org>
|
|
Date: Tue, 19 Sep 2017 13:13:06 -0500
|
|
Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that
|
|
needs it
|
|
|
|
---
|
|
cmake/Modules/AddCompilerRT.cmake | 8 ------
|
|
test/asan/CMakeLists.txt | 52 ---------------------------------------
|
|
test/tsan/CMakeLists.txt | 47 -----------------------------------
|
|
3 files changed, 107 deletions(-)
|
|
|
|
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake
|
|
index bc5fb9ff7..b64eb4246 100644
|
|
--- a/cmake/Modules/AddCompilerRT.cmake
|
|
+++ b/cmake/Modules/AddCompilerRT.cmake
|
|
@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type)
|
|
set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
|
|
set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib")
|
|
endif()
|
|
- if(APPLE)
|
|
- # Ad-hoc sign the dylibs
|
|
- add_custom_command(TARGET ${libname}
|
|
- POST_BUILD
|
|
- COMMAND codesign --sign - $<TARGET_FILE:${libname}>
|
|
- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR}
|
|
- )
|
|
- endif()
|
|
endif()
|
|
install(TARGETS ${libname}
|
|
ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR}
|
|
2.14.1
|
|
|