Skip to content

Commit bbbe441

Browse files
committed
[CI] run-make/thumb: tidy up variables
1 parent 7c438d4 commit bbbe441

File tree

1 file changed

+10
-8
lines changed
  • src/test/run-make/thumb-none-cortex-m

1 file changed

+10
-8
lines changed

src/test/run-make/thumb-none-cortex-m/Makefile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
-include ../../run-make-fulldeps/tools.mk
22

33
# How to run this
4-
# $ ./x.py dist --target x86_64-unknown-linux-gnu,thumbv7m-none-eabi --exclude src/doc
54
# $ ./x.py test --target thumbv7m-none-eabi src/test/run-make
65

76
ifeq ($(TARGET),thumbv7m-none-eabi)
87

9-
#TMP_DIR := $(shell mktemp -d)
10-
TMP_DIR := /tmp/safe_place
8+
# We need to be outside of 'src' dir in order to run cargo
9+
WORK_DIR := $(RUST_TEST_TMPDIR)/run-make/$(TARGET)
10+
1111
CRATE := cortex-m
12+
CRATE_VER := 0.5.0
13+
1214
RUSTC := $(RUSTC_ORIGINAL)
1315
LD_LIBRARY_PATH := $(HOST_RPATH_DIR)
1416

1517
all:
16-
env > env.txt
17-
mkdir -p $(TMP_DIR)
18-
-cd $(TMP_DIR) && rm -rf $(CRATE)
19-
cd $(TMP_DIR) && $(CARGO) clone $(CRATE) --vers 0.5.0
20-
cd $(TMP_DIR) && cd $(CRATE) && $(CARGO) build -j 1 --target $(TARGET) -v
18+
env
19+
mkdir -p $(WORK_DIR)
20+
-cd $(WORK_DIR) && rm -rf $(CRATE)
21+
cd $(WORK_DIR) && $(CARGO) clone $(CRATE) --vers $(CRATE_VER)
22+
cd $(WORK_DIR) && cd $(CRATE) && $(CARGO) build -j 1 --target $(TARGET) -v
2123
else
2224

2325
all:

0 commit comments

Comments
 (0)