about summary refs log tree commit diff
diff options
context:
space:
mode:
authorHideki Sekine <sekineh@me.com>2018-08-08 04:02:02 +0900
committerHideki Sekine <sekineh@me.com>2018-08-08 04:02:02 +0900
commit633832ffc2ba1c63b5ef797ab62bd7388c26ac4f (patch)
tree0d064b295cf3f611ba817329cffa889e59d4ebfa
parent5af644c77bddf446c555499fc4058a3657e00fbb (diff)
downloadrust-633832ffc2ba1c63b5ef797ab62bd7388c26ac4f.tar.gz
rust-633832ffc2ba1c63b5ef797ab62bd7388c26ac4f.zip
[CI] run-make/thumb: 1st working version with hacky workaround.
-rw-r--r--src/test/run-make/thumb-none-cortex-m/Makefile18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/test/run-make/thumb-none-cortex-m/Makefile b/src/test/run-make/thumb-none-cortex-m/Makefile
index e995ffdfc41..a3540b3a3a9 100644
--- a/src/test/run-make/thumb-none-cortex-m/Makefile
+++ b/src/test/run-make/thumb-none-cortex-m/Makefile
@@ -1,20 +1,28 @@
-# Don't use the definitions
-#-include ../../run-make-fulldeps/tools.mk
+-include ../../run-make-fulldeps/tools.mk
+
+# How to run this
+# $ ./x.py dist --target x86_64-unknown-linux-gnu,thumbv7m-none-eabi --exclude src/doc
+# $ ./x.py test --target thumbv7m-none-eabi src/test/run-make
 
 ifeq ($(TARGET),thumbv7m-none-eabi)
 
 #TMP_DIR := $(shell mktemp -d)
 TMP_DIR := /tmp/safe_place
 CRATE := cortex-m
-LD_LIBRARY_PATH=/home/sekineh/rustme9/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/thumbv7m-none-eabi/lib
+RUSTC := $(RUSTC_ORIGINAL)
+LD_LIBRARY_PATH := $(HOST_RPATH_DIR)
+HOST := x86_64-unknown-linux-gnu
 
 all:
+	# Workaround for error[E0463]: can't find crate for `core`
+	-ln -sv $(SRC)/build/tmp/dist/rust-std-*-$(TARGET)/rust-std-$(TARGET)/lib/rustlib/$(TARGET)/lib/*.rlib $(SRC)/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/$(TARGET)/lib/
+	# Workaround for error[E0463]: can't find crate for `std`
+	-ln -sv $(SRC)/build/tmp/dist/rust-std-*-$(HOST)/rust-std-$(HOST)/lib/rustlib/$(HOST)/lib/*.rlib $(SRC)/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/$(HOST)/lib/
 	env > env.txt
 	mkdir -p $(TMP_DIR)
 	-cd $(TMP_DIR) && rm -rf $(CRATE)
 	cd $(TMP_DIR) && $(CARGO) clone $(CRATE) --vers 0.5.0
-	pwd
-	cd $(TMP_DIR) && cd $(CRATE) && env RUST_LOG=debug $(CARGO) build -j 1 --target $(TARGET) -vv 2>&1 | tee cargo-fail-vv-9.2.log
+	cd $(TMP_DIR) && cd $(CRATE) && $(CARGO) build -j 1 --target $(TARGET) -v
 else
 
 all: