diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2020-09-15 18:29:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-15 18:29:15 +0300 |
| commit | cdeef84f3cd7d5e219608e8ef726f317da5ebfb2 (patch) | |
| tree | 6688ca13b84e4341e569a98dddbd1d143d8e0244 | |
| parent | 9b9e4ba6e81d9ad8e84cda65427a33212d8d6ae5 (diff) | |
Added hard limit to sub-make jobs. Fixes #19784 (#20389)mono-6.12.0.99
Co-authored-by: Andy Savage <45369568+andy-noisyduck@users.noreply.github.com>
| -rw-r--r-- | llvm/build.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/build.mk b/llvm/build.mk index 28ee86481f5..7de175baee2 100644 --- a/llvm/build.mk +++ b/llvm/build.mk @@ -9,6 +9,8 @@ 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) + CMAKE := $(or $(CMAKE),$(shell which cmake)) NINJA := $(shell which ninja) @@ -43,7 +45,7 @@ configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile) .PHONY: build-llvm build-llvm: configure-llvm - DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j) -C $(LLVM_BUILD) + DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE) -j$(CPU_COUNT)) -C $(LLVM_BUILD) .PHONY: install-llvm install-llvm: build-llvm |