diff options
| author | Jo Shields <joshield@microsoft.com> | 2019-11-07 20:16:29 +0300 |
|---|---|---|
| committer | Jo Shields <joshield@microsoft.com> | 2019-11-07 20:16:29 +0300 |
| commit | c1c483cef899cb1a7fb7c5202b98ffddec091375 (patch) | |
| tree | 2b776e3214cc883c67a3d8a64bbef8c0009df373 /sdks | |
| parent | d0d779b8d92bfce3bddc118b57f47a0c7c48b722 (diff) | |
LLVM changes for SDKs
Diffstat (limited to 'sdks')
| -rw-r--r-- | sdks/builds/llvm.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sdks/builds/llvm.mk b/sdks/builds/llvm.mk index a8efcabe976..5c862dfefcd 100644 --- a/sdks/builds/llvm.mk +++ b/sdks/builds/llvm.mk @@ -26,10 +26,10 @@ archive-$(1)-$(2): package-$(1)-$(2) tar -cvzf $$(TOP)/$$(_$(1)-$(2)_PACKAGE) -C $$(TOP)/sdks/out/$(1)-$(2) . endef -$(eval $(call LLVMProvisionTemplate,llvm,llvm64,$(TOP)/external/llvm)) -$(eval $(call LLVMProvisionTemplate,llvm,llvmwin64,$(TOP)/external/llvm)) +$(eval $(call LLVMProvisionTemplate,llvm,llvm64,$(TOP)/external/llvm-project/llvm)) +$(eval $(call LLVMProvisionTemplate,llvm,llvmwin64,$(TOP)/external/llvm-project/llvm)) ifeq ($(UNAME),Windows) -$(eval $(call LLVMProvisionTemplate,llvm,llvmwin64-msvc,$(TOP)/external/llvm)) +$(eval $(call LLVMProvisionTemplate,llvm,llvmwin64-msvc,$(TOP)/external/llvm-project/llvm)) endif ## @@ -93,8 +93,8 @@ define LLVMMxeTemplate # -DCMAKE_EXE_LINKER_FLAGS=-static is needed so that we don't dynamically link with any of the mingw gcc support libs. _llvm-$(1)_CMAKE_ARGS = \ -DCMAKE_EXE_LINKER_FLAGS=\"-static\" \ - -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_TOOLCHAIN_FILE=$$(TOP)/external/llvm/cmake/modules/NATIVE.cmake \ - -DCMAKE_TOOLCHAIN_FILE=$$(TOP)/external/llvm/cmake/modules/$(3).cmake \ + -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DCMAKE_TOOLCHAIN_FILE=$$(TOP)/external/llvm-project/llvm/cmake/modules/NATIVE.cmake \ + -DCMAKE_TOOLCHAIN_FILE=$$(TOP)/external/llvm-project/llvm/cmake/modules/$(3).cmake \ -DLLVM_ENABLE_THREADS=Off \ -DLLVM_BUILD_EXECUTION_ENGINE=Off \ $$(llvm-$(1)_CMAKE_ARGS) @@ -104,7 +104,7 @@ _llvm-$(1)_CMAKE_ARGS += \ -DZLIB_ROOT=$$(MXE_PREFIX)/opt/mingw-zlib/usr/$(2)-w64-mingw32 -DZLIB_LIBRARY=$$(MXE_PREFIX)/opt/mingw-zlib/usr/$(2)-w64-mingw32/lib/libz.a -DZLIB_INCLUDE_DIR=$$(MXE_PREFIX)/opt/mingw-zlib/usr/$(2)-w64-mingw32/include endif -$$(TOP)/external/llvm/cmake/modules/$(3).cmake: $(3).cmake.in +$$(TOP)/external/llvm-project/llvm/cmake/modules/$(3).cmake: $(3).cmake.in sed -e 's,@MXE_PATH@,$$(MXE_PREFIX),' < $$< > $$@ .PHONY: setup-llvm-$(1) @@ -112,7 +112,7 @@ setup-llvm-$(1): mkdir -p $$(TOP)/sdks/out/llvm-$(1) .PHONY: package-llvm-$(1) -package-llvm-$(1): $$(TOP)/external/llvm/cmake/modules/$(3).cmake setup-llvm-$(1) +package-llvm-$(1): $$(TOP)/external/llvm-project/llvm/cmake/modules/$(3).cmake setup-llvm-$(1) $$(MAKE) -C $$(TOP)/llvm -f build.mk install-llvm \ LLVM_BUILD="$$(TOP)/sdks/builds/llvm-$(1)" \ LLVM_PREFIX="$$(TOP)/sdks/out/llvm-$(1)" \ |