diff options
| author | John Hodge (Mutabah) <acessdev@gmail.com> | 2017-02-21 08:49:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 08:49:09 +0800 |
| commit | a4ec506e3f3c23c7818c3ce2d020b25966c420d8 (patch) | |
| tree | 3928b7aa98144bafb70cd75dd200c1e04d6ce608 | |
| parent | 309a23d17998edd9f4b314570c7752b97d3cda72 (diff) | |
| parent | 9a817a3bd03d2447118aa2a0d9a1a68fdaa20ef8 (diff) | |
| download | mrust-a4ec506e3f3c23c7818c3ce2d020b25966c420d8.tar.gz | |
Merge pull request #18 from est31/master
Use $(MAKE) to utilize Make jobserver
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 7 |
2 files changed, 4 insertions, 4 deletions
@@ -4,6 +4,7 @@ /mrustc.layout /rustc-nightly-src.tar.gz /rustc-nightly +/crates.io /test_deps_run-pass.mk /.obj @@ -289,7 +289,7 @@ $(RUSTCSRC): rust-nightly-date # - libbacktrace, needed for libstd on linux output/libs/libbacktrace.a: $(RUSTCSRC)src/libbacktrace/Makefile @mkdir -p $(dir $@) - @cd $(RUSTCSRC)src/libbacktrace && make INCDIR=. + @cd $(RUSTCSRC)src/libbacktrace && $(MAKE) INCDIR=. @cp $(RUSTCSRC)src/libbacktrace/.libs/libbacktrace.a $@ $(RUSTCSRC)src/libbacktrace/Makefile: @echo "[configure] $(RUSTCSRC)src/libbacktrace" @@ -301,11 +301,10 @@ LLVM_CMAKE_OPTS += LLVM_TARGETS_TO_BUILD=X86#;ARM;AArch64;Mips;PowerPC;SystemZ;J LLVM_CMAKE_OPTS += LLVM_ENABLE_ASSERTIONS=OFF LLVM_CMAKE_OPTS += LLVM_INCLUDE_EXAMPLES=OFF LLVM_INCLUDE_TESTS=OFF LLVM_INCLUDE_DOCS=OFF LLVM_CMAKE_OPTS += LLVM_ENABLE_ZLIB=OFF LLVM_ENABLE_TERMINFO=OFF LLVM_ENABLE_LIBEDIT=OFF WITH_POLLY=OFF -LLVM_CMAKE_OPTS += CMAKE_CXX_COMPILER="g++" CMAKE_C_COMPILER="gcc" -LLVM_PAR_LEVEL ?= +LLVM_CMAKE_OPTS += CMAKE_CXX_COMPILER="g++" CMAKE_C_COMPILER="gcc" $(LLVM_CONFIG): $(RUSTCSRC)build/Makefile - $Vcd $(RUSTCSRC)build && make $(LLVM_PAR_LEVEL) + $Vcd $(RUSTCSRC)build && $(MAKE) $(RUSTCSRC)build/Makefile: $(RUSTCSRC)src/llvm/CMakeLists.txt @mkdir -p $(RUSTCSRC)build $Vcd $(RUSTCSRC)build && cmake $(addprefix -D , $(LLVM_CMAKE_OPTS)) ../src/llvm |