diff options
| author | Alexander Kyte <alexmkyte@gmail.com> | 2018-10-10 22:46:31 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-10-10 22:46:31 +0300 |
| commit | b4067405d3ad19fd7a3a1d7cd38b1f92986c2841 (patch) | |
| tree | 33e463bcb2622b2a744766037bc1ccb7a467da79 /llvm | |
| parent | fb7ad92db918b2a217e4f21f8f46246a701ce8b0 (diff) | |
[runtime] Fix internal llvm (#11074)
The makefile uses $(dir $<) which has `../` and so refers to `llvm/external/llvm` rather than `external/llvm` now that we're using llvm from a submodule in external/
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/build.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/llvm/build.mk b/llvm/build.mk index 9b4607a65b5..629ca932056 100644 --- a/llvm/build.mk +++ b/llvm/build.mk @@ -1,10 +1,10 @@ -top_srcdir ?= $(abspath $(CURDIR)/..) +abs_top_srcdir ?= $(abspath $(CURDIR)/..) -LLVM_BUILD ?= $(abspath $(top_srcdir)/llvm/build) -LLVM_PREFIX ?= $(abspath $(top_srcdir)/llvm/usr) +LLVM_BUILD ?= $(abspath $(abs_top_srcdir)/llvm/build) +LLVM_PREFIX ?= $(abspath $(abs_top_srcdir)/llvm/usr) -# LLVM_BRANCH := $(shell git -C "$(top_srcdir)/external/llvm" rev-parse --abbrev-ref HEAD) -LLVM_VERSION := $(shell git -C "$(top_srcdir)/external/llvm" rev-parse HEAD) +# LLVM_BRANCH := $(shell git -C "$(abs_top_srcdir)/external/llvm" rev-parse --abbrev-ref HEAD) +LLVM_VERSION := $(shell git -C "$(abs_top_srcdir)/external/llvm" rev-parse HEAD) # FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(LLVM_BRANCH)/llvm-osx64-$(LLVM_VERSION).tar.gz LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(LLVM_VERSION).tar.gz" @@ -17,7 +17,7 @@ $(LLVM_BUILD) $(LLVM_PREFIX): EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",) -$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(top_srcdir)/external/llvm/CMakeLists.txt | $(LLVM_BUILD) $(LLVM_PREFIX) +$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(abs_top_srcdir)/external/llvm/CMakeLists.txt | $(LLVM_BUILD) $(LLVM_PREFIX) cd $(LLVM_BUILD) && $(CMAKE) \ $(if $(NINJA),-G Ninja) \ -DCMAKE_INSTALL_PREFIX="$(LLVM_PREFIX)" \ @@ -31,7 +31,7 @@ $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(top_srcdir)/external/llvm/C $(EXTRA_LLVM_ARGS) \ -DLLVM_ENABLE_ASSERTIONS=$(if $(INTERNAL_LLVM_ASSERTS),On,Off) \ $(LLVM_CMAKE_ARGS) \ - $(dir $<) + $(abs_top_srcdir)/external/llvm .PHONY: configure-llvm configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile) |