[arch-commits] Commit in zig/trunk (2 files)
Daurnimator
daurnimator at archlinux.org
Tue Apr 9 10:29:52 UTC 2019
Date: Tuesday, April 9, 2019 @ 10:29:51
Author: daurnimator
Revision: 450584
amend Add zig: missing patches
Added:
zig/trunk/force_dynamic_llvm.patch
zig/trunk/no_stage2_artifacts.patch
---------------------------+
force_dynamic_llvm.patch | 16 ++++++++++++++++
no_stage2_artifacts.patch | 20 ++++++++++++++++++++
2 files changed, 36 insertions(+)
Added: force_dynamic_llvm.patch
===================================================================
--- force_dynamic_llvm.patch (rev 0)
+++ force_dynamic_llvm.patch 2019-04-09 10:29:51 UTC (rev 450584)
@@ -0,0 +1,16 @@
+ cmake/Findllvm.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
+index 9a4fa3f3..64e31fc0 100644
+--- a/cmake/Findllvm.cmake
++++ b/cmake/Findllvm.cmake
+@@ -15,7 +15,7 @@ find_program(LLVM_CONFIG_EXE
+ "c:/msys64/mingw64/bin"
+ "C:/Libraries/llvm-7.0.0/bin")
+
+-if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC)
++if(false)
+ execute_process(
+ COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static
+ OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES
Added: no_stage2_artifacts.patch
===================================================================
--- no_stage2_artifacts.patch (rev 0)
+++ no_stage2_artifacts.patch 2019-04-09 10:29:51 UTC (rev 450584)
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bda57634..52599838 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -254,7 +254,6 @@ else()
+ embedded_lld_wasm
+ embedded_lld_lib
+ )
+- install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
+ endif()
+
+ # No patches have been applied to SoftFloat-3e
+@@ -775,7 +774,6 @@ if(MSVC OR MINGW)
+ target_link_libraries(zig LINK_PUBLIC version)
+ endif()
+ install(TARGETS zig DESTINATION bin)
+-install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}")
+
+ foreach(file ${ZIG_C_HEADER_FILES})
+ get_filename_component(file_dir "${C_HEADERS_DEST}/${file}" DIRECTORY)
More information about the arch-commits
mailing list