summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@ucc.asn.au>2017-10-01 18:23:11 +0800
committerJohn Hodge <tpg@ucc.asn.au>2017-10-01 18:23:11 +0800
commit50ff8e96ad3ffecbce027e706e5f06ada9745730 (patch)
treee6b5a6a7bcc96bed76fd85047e3dcea586730b64
parentb078a9a117ec542c6f3d1b974559540ae0077ef1 (diff)
downloadmrust-50ff8e96ad3ffecbce027e706e5f06ada9745730.tar.gz
Makefile - Little bit of cleanup
-rw-r--r--Makefile2
-rw-r--r--minicargo.mk6
2 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 7e46f083..2f8e3b4b 100644
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,6 @@ RUST_FLAGS += -g
RUST_FLAGS += -O
RUST_FLAGS += -L output/
RUST_FLAGS += $(RUST_FLAGS_EXTRA)
-# > TODO: This is needed for anything that uses libstd. build.rs adds it with cargo magic, no idea how it gets to the rlib
-RUST_FLAGS += -lbacktrace -ldl -lrt -lpthread
SHELL = bash
diff --git a/minicargo.mk b/minicargo.mk
index 4ac59f42..4887ba51 100644
--- a/minicargo.mk
+++ b/minicargo.mk
@@ -75,7 +75,5 @@ $(RUSTCSRC)build/Makefile: $(RUSTCSRC)src/llvm/CMakeLists.txt
#
# Developement-only targets
#
-$(OUTDIR)libnum_traits-0_1_37.hir: $(MRUSTC) $(OUTDIR)libstd.hir
- $(MINICARGO) $(RUSTCSRC)src/vendor/num-traits --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
-$(OUTDIR)libsocket2-0_2_1.hir: $(OUTDIR)libstd.hir
- $(MINICARGO) $(RUSTCSRC)src/vendor/socket2 --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
+#$(OUTDIR)libserde-1_0_6.hir: $(MRUSTC) $(OUTDIR)libstd.hir
+# $(MINICARGO) $(RUSTCSRC)src/vendor/serde --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)