Add an LLVM patch to fix the windows build breakage from #18490 (#18538)

create DestSharedLibDir in the LLVM Makefile
JuliaLang · Sep 16, 2016 · 3a31155 · 3a31155 · nanosoldier · Sep 17, 2016
1 parent 628d0e4
commit 3a31155
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -432,6 +432,7 @@ $(eval $(call LLVM_PATCH,llvm-D14260))
 $(eval $(call LLVM_PATCH,llvm-nodllalias))
 $(eval $(call LLVM_PATCH,llvm-D21271-instcombine-tbaa-3.7))
 $(eval $(call LLVM_PATCH,llvm-win64-reloc-dwarf))
+$(eval $(call LLVM_PATCH,llvm-3.7.1_destsharedlibdir))
 else ifeq ($(LLVM_VER_SHORT),3.8)
 ifeq ($(LLVM_VER),3.8.0)
 $(eval $(call LLVM_PATCH,llvm-D17326_unpack_load))

diff --git a/deps/patches/llvm-3.7.1_destsharedlibdir.patch b/deps/patches/llvm-3.7.1_destsharedlibdir.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile.rules b/Makefile.rules
+index 24cac3b..4f52dbb 100644
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -1234,6 +1234,9 @@ endif
+ DestSharedLib := $(DestSharedLibDir)/$(BaseLibName.SO)
+ DestSharedAlias := $(DestSharedLibDir)/$(BaseAliasName.SO)
+
++$(DestSharedLibDir)::
++ $(MKDIR) $(DestSharedLibDir)
++
+ install-local:: $(DestSharedLib)
+
+ $(DestSharedLib): $(LibName.SO) $(DestSharedLibDir)