From 3a311556050ee70e71c43c3ca6bc86165174da77 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Fri, 16 Sep 2016 14:18:02 -0700 Subject: [PATCH] Add an LLVM patch to fix the windows build breakage from #18490 (#18538) create DestSharedLibDir in the LLVM Makefile --- deps/llvm.mk | 1 + deps/patches/llvm-3.7.1_destsharedlibdir.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 deps/patches/llvm-3.7.1_destsharedlibdir.patch diff --git a/deps/llvm.mk b/deps/llvm.mk index 000ef809bbd3a..6796cce9e2e45 100644 --- 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 new file mode 100644 index 0000000000000..91cbb35232521 --- /dev/null +++ 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)