diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | minicargo.mk | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -322,7 +322,7 @@ src/main.cpp: $(PCHS:%=src/%.gch) $V$(CXX) -std=c++14 -o $@ $< $(CPPFLAGS) -MMD -MP -MF $@.dep tools/bin/common_lib.a: - make -C tools/common + $(MAKE) -C tools/common -include $(OBJ:%=%.dep) diff --git a/minicargo.mk b/minicargo.mk index aee2483a..dd3075c6 100644 --- a/minicargo.mk +++ b/minicargo.mk @@ -34,7 +34,8 @@ else endif LLVM_CONFIG := $(RUSTCSRC)build/bin/llvm-config -RUSTC_TARGET := x86_64-unknown-linux-gnu +RUSTC_TARGET ?= x86_64-unknown-linux-gnu +LLVM_TARGETS ?= "X86;ARM;AArch64" #;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX OVERRIDE_DIR := script-overrides/$(RUSTC_CHANNEL)-$(RUSTC_VERSION)$(OVERRIDE_SUFFIX)/ .PHONY: bin/mrustc tools/bin/minicargo @@ -95,11 +96,11 @@ $(OUTDIR)cargo: $(MRUSTC) LIBS # Reference $(RUSTCSRC)src/bootstrap/native.rs for these values LLVM_CMAKE_OPTS := LLVM_TARGET_ARCH=$(firstword $(subst -, ,$(RUSTC_TARGET))) LLVM_DEFAULT_TARGET_TRIPLE=$(RUSTC_TARGET) -LLVM_CMAKE_OPTS += LLVM_TARGETS_TO_BUILD=X86#;ARM;AArch64;Mips;PowerPC;SystemZ;JSBackend;MSP430;Sparc;NVPTX +LLVM_CMAKE_OPTS += LLVM_TARGETS_TO_BUILD="$(LLVM_TARGETS)" 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_CMAKE_OPTS += CMAKE_CXX_COMPILER="$(CXX)" CMAKE_C_COMPILER="$(CC)" LLVM_CMAKE_OPTS += CMAKE_BUILD_TYPE=RelWithDebInfo |