diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-05-18 16:34:37 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-05-18 16:34:37 +0800 |
| commit | 278efd923cb06f2c3f9719db54f775ed2a29062e (patch) | |
| tree | bf22d773d3c31edb0290bb8360e0ef5cc7fd3db8 | |
| parent | a2b3ce762d7bf4955f59d4827d5d3dded75307ce (diff) | |
| download | mrust-278efd923cb06f2c3f9719db54f775ed2a29062e.tar.gz | |
minicargo.mk - Tweaks
| -rw-r--r-- | minicargo.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/minicargo.mk b/minicargo.mk index 70b4c058..14773e60 100644 --- a/minicargo.mk +++ b/minicargo.mk @@ -16,7 +16,7 @@ PARLEVEL ?= 1 MINICARGO_FLAGS ?= ifneq ($(MMIR),) - OUTDIR_SUF := -mmir + OUTDIR_SUF := $(OUTDIR_SUF)-mmir MINICARGO_FLAGS += -Z emit-mmir endif ifneq ($(PARLEVEL),1) @@ -27,6 +27,10 @@ OUTDIR := output$(OUTDIR_SUF)/ MRUSTC := bin/mrustc MINICARGO := tools/bin/minicargo +RUSTC_OUT_BIN := rustc +ifeq ($(RUSTC_VERSION),1.29.0) + RUSTC_OUT_BIN := rustc_binary +endif ifeq ($(RUSTC_CHANNEL),nightly) RUSTCSRC := rustc-nightly-src/ else @@ -88,7 +92,8 @@ RUSTC_ENV_VARS += CFG_LIBDIR_RELATIVE=lib $(OUTDIR)rustc: $(MRUSTC) $(MINICARGO) LIBS $(LLVM_CONFIG) mkdir -p $(OUTDIR)rustc-build $(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)src/rustc --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS) - cp $(OUTDIR)rustc-build/rustc $(OUTDIR) +# $(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)src/librustc_codegen_llvm --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)rustc-build -L $(OUTDIR) $(MINICARGO_FLAGS) + cp $(OUTDIR)rustc-build/$(RUSTC_OUT_BIN) $@ $(OUTDIR)cargo: $(MRUSTC) LIBS mkdir -p $(OUTDIR)cargo-build $(MINICARGO) $(RUSTCSRC)src/tools/cargo --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)cargo-build -L $(OUTDIR) $(MINICARGO_FLAGS) |