diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-05-07 18:20:34 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-05-10 16:38:46 +0300 |
| commit | 6e079842a6575052adabfd16f35d3362a2f5cf78 (patch) | |
| tree | 25d128cd223c1f56e69663a528dfd017bb8f05d5 | |
| parent | 28a101a8ab5a3852bcb8876edfbc9d9f1360cd35 (diff) | |
sdks: Disable parallelism for mxe llvmwin64 build
For some reason it recently fails with weird race conditions, let's see if that helps.
| -rw-r--r-- | llvm/build.mk | 2 | ||||
| -rw-r--r-- | sdks/builds/llvm.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/llvm/build.mk b/llvm/build.mk index 7de175baee2..a66200d07de 100644 --- a/llvm/build.mk +++ b/llvm/build.mk @@ -9,7 +9,7 @@ LLVM_VERSION := $(shell git -C "$(abs_top_srcdir)/external/llvm-project/llvm" re # 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" -CPU_COUNT := $(shell getconf _NPROCESSORS_ONLN || echo 8) +CPU_COUNT ?= $(shell getconf _NPROCESSORS_ONLN || echo 8) CMAKE := $(or $(CMAKE),$(shell which cmake)) NINJA := $(shell which ninja) diff --git a/sdks/builds/llvm.mk b/sdks/builds/llvm.mk index 5c862dfefcd..95fef0cb208 100644 --- a/sdks/builds/llvm.mk +++ b/sdks/builds/llvm.mk @@ -114,6 +114,7 @@ setup-llvm-$(1): .PHONY: package-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 \ + CPU_COUNT=1 \ LLVM_BUILD="$$(TOP)/sdks/builds/llvm-$(1)" \ LLVM_PREFIX="$$(TOP)/sdks/out/llvm-$(1)" \ LLVM_CMAKE_ARGS="$$(_llvm-$(1)_CMAKE_ARGS)" |