diff options
| author | John Hodge <tpg@ucc.asn.au> | 2017-11-25 15:30:07 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2017-11-25 15:30:07 +0800 |
| commit | 5ffb0d95d80342ebdb2bb7d2bb56317c204e52ea (patch) | |
| tree | 17cb813268e75336270eb8c592483c772dae1c88 | |
| parent | 9e4094e070e478f5b3207a3c01019dabe665dd34 (diff) | |
| download | mrust-5ffb0d95d80342ebdb2bb7d2bb56317c204e52ea.tar.gz | |
run_rustc - Store libraries in a place rustc will find them
| -rw-r--r-- | run_rustc/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/run_rustc/Makefile b/run_rustc/Makefile index 19a87a38..03d3e007 100644 --- a/run_rustc/Makefile +++ b/run_rustc/Makefile @@ -5,7 +5,7 @@ RUST_SRC := ../rustc-1.19.0-src/src/ PREFIX := prefix/ BINDIR := $(PREFIX)bin/ -LIBDIR := $(PREFIX)lib/ +LIBDIR := $(PREFIX)lib/rustlib/x86_64-unknown-linux-gnu/lib/ V ?= @ @@ -23,13 +23,15 @@ $(RUSTC): $(BINDIR)rustc: $(RUSTC) @mkdir -p $(dir $@) - $Vcp $@ $< + $Vcp $< $@ $(BINDIR)cargo: ../output/cargo @mkdir -p $(dir $@) - $Vcp $@ $< + $Vcp $< $@ -#$(LIBDIR)libstd.rlib: $(RUSTC) $(BINDIR)cargo -# $(BINDIR)cargo +#$(LIBDIR)libstd.rlib-: $(RUSTC) $(BINDIR)cargo $(BINDIR)rustc +# @mkdir -p ./build/libstd +# cd $(RUST_SRC)libstd && CARGO_TARGET_DIR=$(abspath ./build/libstd) PATH="$(abspath $(BINDIR)):$$PATH" cargo build +# cp ./build/libstd/target/libstd.rlib $@ $(LIBDIR)%.rlib: $(RUST_SRC)%/lib.rs $(RUSTC) @mkdir -p $(dir $@) |