Skip to content

Commit 6a71143

Browse files
run-make/cross-lang-lto: Make output artifact names consistent across platforms.
1 parent 34e658e commit 6a71143

File tree

1 file changed

+3
-2
lines changed
  • src/test/run-make/cross-lang-lto

1 file changed

+3
-2
lines changed

src/test/run-make/cross-lang-lto/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
# min-llvm-version 4.0
3+
# ignore-mingw
34

45
-include ../../run-make-fulldeps/tools.mk
56

@@ -24,7 +25,7 @@ BUILD_EXE=$(RUSTC) main.rs -Copt-level=2 -Z cross-lang-lto -Ccodegen-units=1 --e
2425
all: staticlib staticlib-fat-lto staticlib-thin-lto rlib exe cdylib rdylib
2526

2627
staticlib: lib.rs
27-
$(BUILD_LIB) --crate-type=staticlib
28+
$(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib.a
2829
[ "$$($(SECTION_HEADERS) $(TMPDIR)/liblib.a | grep -c $(LLVMBC_SECTION_NAME))" -ne "0" ]
2930

3031
staticlib-fat-lto: lib.rs
@@ -36,7 +37,7 @@ staticlib-thin-lto: lib.rs
3637
[ "$$($(SECTION_HEADERS) $(TMPDIR)/liblib-thin-lto.a | grep -c $(LLVMBC_SECTION_NAME))" -ne "0" ]
3738

3839
rlib: lib.rs
39-
$(BUILD_LIB) --crate-type=rlib
40+
$(BUILD_LIB) --crate-type=rlib -o $(TMPDIR)/liblib.rlib
4041
[ "$$($(SECTION_HEADERS) $(TMPDIR)/liblib.rlib | grep -c $(LLVMBC_SECTION_NAME))" -ne "0" ]
4142

4243
cdylib: lib.rs

0 commit comments

Comments
 (0)