diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2018-08-16 17:01:26 +0300 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2018-08-16 17:01:26 +0300 |
| commit | 9f495889aea7a322c30a57579bf17b8aaab84007 (patch) | |
| tree | ae96e1fd22a0776bd8aa5f465e31fc1d2a0f9e36 /llvm | |
| parent | 933ddeb0aced67313525fa89c5cd4521cabaf055 (diff) | |
[wasm] Fix llvm scripts for the sdks
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/Makefile.am | 6 | ||||
| -rw-r--r-- | llvm/build.mk | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/llvm/Makefile.am b/llvm/Makefile.am index 6dc17ce99f5..8656bb3b96f 100644 --- a/llvm/Makefile.am +++ b/llvm/Makefile.am @@ -34,4 +34,10 @@ endif # Override this so we don't try to re-copy llvm when we install mono install: +if TARGET_WASM +LLVM_TARGET=wasm32 +else +LLVM_TARGET= +endif + include build.mk diff --git a/llvm/build.mk b/llvm/build.mk index e9cc77e1b05..d45e0a27c8e 100644 --- a/llvm/build.mk +++ b/llvm/build.mk @@ -4,6 +4,9 @@ # make reset-llvm will checkout a version of llvm which is suitable for this version of mono # into $top_srcdir/llvm/llvm. # +# Input variables +# - LLVM_TARGET: if set to wasm32 will trigger a 32bits build that enable the experimental WebAssembly backend +# top_srcdir ?= $(abspath $(CURDIR)/..) @@ -38,15 +41,7 @@ $(LLVM_BUILD) $(LLVM_PREFIX): $(LLVM_PATH)/CMakeLists.txt: | reset-$(LLVM_RELEASE) -if TARGET_WASM - -EXTRA_LLVM_ARGS = -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly" - -else - -EXTRA_LLVM_ARGS = - -endif +EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",NADA) $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt | $(LLVM_BUILD) cd $(LLVM_BUILD) && $(CMAKE) \ |