Skip to content

Commit 3a31155

Browse files
authored
Add an LLVM patch to fix the windows build breakage from #18490 (#18538)
create DestSharedLibDir in the LLVM Makefile
1 parent 628d0e4 commit 3a31155

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

deps/llvm.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ $(eval $(call LLVM_PATCH,llvm-D14260))
432432
$(eval $(call LLVM_PATCH,llvm-nodllalias))
433433
$(eval $(call LLVM_PATCH,llvm-D21271-instcombine-tbaa-3.7))
434434
$(eval $(call LLVM_PATCH,llvm-win64-reloc-dwarf))
435+
$(eval $(call LLVM_PATCH,llvm-3.7.1_destsharedlibdir))
435436
else ifeq ($(LLVM_VER_SHORT),3.8)
436437
ifeq ($(LLVM_VER),3.8.0)
437438
$(eval $(call LLVM_PATCH,llvm-D17326_unpack_load))
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/Makefile.rules b/Makefile.rules
2+
index 24cac3b..4f52dbb 100644
3+
--- a/Makefile.rules
4+
+++ b/Makefile.rules
5+
@@ -1234,6 +1234,9 @@ endif
6+
DestSharedLib := $(DestSharedLibDir)/$(BaseLibName.SO)
7+
DestSharedAlias := $(DestSharedLibDir)/$(BaseAliasName.SO)
8+
9+
+$(DestSharedLibDir)::
10+
+ $(MKDIR) $(DestSharedLibDir)
11+
+
12+
install-local:: $(DestSharedLib)
13+
14+
$(DestSharedLib): $(LibName.SO) $(DestSharedLibDir)

0 commit comments

Comments
 (0)