Skip to content

Commit 4436b90

Browse files
committed
add hacky fix for cmake and mingw32
1 parent 4a3f6b4 commit 4436b90

File tree

2 files changed

+33
-0
lines changed

2 files changed

+33
-0
lines changed

deps/llvm.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ $(eval $(call LLVM_PATCH,llvm-PPC-addrspaces)) # PPC
523523
$(eval $(call LLVM_PATCH,llvm-D42260)) # remove for 7.0 (probably)
524524
$(eval $(call LLVM_PATCH,llvm-rL326843-missing-header)) # remove for 7.0 (might be nominated for 6.0.1)
525525
$(eval $(call LLVM_PATCH,llvm-6.0-r327540)) # remove for 7.0 (might be nominated for 6.0.1)
526+
$(eval $(call LLVM_PATCH,llvm-6.0-cmake-mingw32)) # HACK, needs to be polished and upstreamed
526527
endif # LLVM_VER
527528

528529
# Remove hardcoded OS X requirements in compilter-rt cmake build
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 8ba11e6bfb673ef5b1266335ca92e77104a5d3f8 Mon Sep 17 00:00:00 2001
2+
From: Valentin Churavy <[email protected]>
3+
Date: Thu, 15 Mar 2018 18:36:12 -0400
4+
Subject: [PATCH] hacky CMAKE fix for MINGW32
5+
6+
---
7+
tools/llvm-cfi-verify/lib/CMakeLists.txt | 11 ++---------
8+
1 file changed, 2 insertions(+), 9 deletions(-)
9+
10+
diff --git a/tools/llvm-cfi-verify/lib/CMakeLists.txt b/tools/llvm-cfi-verify/lib/CMakeLists.txt
11+
index cd728e004b2..c6c2896737c 100644
12+
--- a/tools/llvm-cfi-verify/lib/CMakeLists.txt
13+
+++ b/tools/llvm-cfi-verify/lib/CMakeLists.txt
14+
@@ -6,12 +6,5 @@ add_library(LLVMCFIVerify
15+
GraphBuilder.h)
16+
17+
llvm_update_compile_flags(LLVMCFIVerify)
18+
-llvm_map_components_to_libnames(libs
19+
- DebugInfoDWARF
20+
- MC
21+
- MCParser
22+
- Object
23+
- Support
24+
- Symbolize)
25+
-target_link_libraries(LLVMCFIVerify ${libs})
26+
-set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
27+
\ No newline at end of file
28+
+target_link_libraries(LLVMCFIVerify LLVM)
29+
+set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
30+
--
31+
2.16.2
32+

0 commit comments

Comments
 (0)