diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2018-08-06 11:21:33 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-08-06 11:21:33 +0300 |
| commit | a62bb95b279aa262df93e592d2cea4bba68e256e (patch) | |
| tree | 15eccb056e95bc4ff640c807983b122e9905aec0 /llvm | |
| parent | 7beff1090ce16fb6ed85db63dcb837647c63e296 (diff) | |
[sdks] Switch the 32 bit cross compilers back to the old llvm 3.6, the new version has too many problems. (#9889)
* [sdks] Switch the 32 bit cross compilers back to the old llvm 3.6, the new version has too many problems.
* [sdks] Fix building llvm36.
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/SUBMODULES.json | 8 | ||||
| -rw-r--r-- | llvm/build.mk | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/llvm/SUBMODULES.json b/llvm/SUBMODULES.json index 4d31216460b..36d0760bea6 100644 --- a/llvm/SUBMODULES.json +++ b/llvm/SUBMODULES.json @@ -6,5 +6,13 @@ "remote-branch": "origin/release_60", "branch": "release_60", "directory": "llvm" + }, + { + "name": "llvm36", + "url": "git://github.com/mono/llvm.git", + "rev": "0b3cb8ac12cd839f8110775d4085e822e8af4d7b", + "remote-branch": "origin/master", + "branch": "master", + "directory": "llvm36" } ] diff --git a/llvm/build.mk b/llvm/build.mk index 8875ce11b67..ca5cce0eb1a 100644 --- a/llvm/build.mk +++ b/llvm/build.mk @@ -10,6 +10,7 @@ top_srcdir ?= $(abspath $(CURDIR)/..) LLVM_PATH ?= $(abspath $(top_srcdir)/external/llvm) LLVM_BUILD ?= $(abspath $(top_srcdir)/llvm/build) LLVM_PREFIX ?= $(abspath $(top_srcdir)/llvm/usr) +LLVM_VERSION ?= llvm CMAKE := $(or $(CMAKE),$(shell which cmake)) NINJA := $(shell which ninja) @@ -18,6 +19,7 @@ SUBMODULES_CONFIG_FILE = $(top_srcdir)/llvm/SUBMODULES.json include $(top_srcdir)/scripts/submodules/versions.mk $(eval $(call ValidateVersionTemplate,llvm,LLVM)) +$(eval $(call ValidateVersionTemplate,llvm36,LLVM36)) # Bump the given submodule to the revision given by the REV make variable # If COMMIT is 1, commit the change @@ -34,7 +36,7 @@ bump-current-llvm: __bump-current-version-llvm $(LLVM_BUILD) $(LLVM_PREFIX): mkdir -p $@ -$(LLVM_PATH)/CMakeLists.txt: | reset-llvm +$(LLVM_PATH)/CMakeLists.txt: | reset-$(LLVM_VERSION) $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt | $(LLVM_BUILD) cd $(LLVM_BUILD) && $(CMAKE) \ @@ -70,6 +72,10 @@ install-llvm: build-llvm | $(LLVM_PREFIX) download-llvm: wget --no-verbose -O - http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(NEEDED_LLVM_VERSION).tar.gz | tar xzf - +.PHONY: download-llvm36 +download-llvm36: + wget --no-verbose -O - http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm/llvm-osx64-$(NEEDED_LLVM36_VERSION).tar.gz | tar xzf - + .PHONY: clean-llvm clean-llvm: $(RM) -r $(LLVM_BUILD) $(LLVM_PREFIX) |