Skip to content

Commit dd3f445

Browse files
Fix some run-make tests after object file naming has changed.
1 parent 94b32ad commit dd3f445

File tree

2 files changed

+5
-5
lines changed
  • src/test/run-make-fulldeps

2 files changed

+5
-5
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ all: staticlib staticlib-fat-lto staticlib-thin-lto rlib exe cdylib rdylib
1717
staticlib: lib.rs
1818
$(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib.a
1919
$(call EXTRACT_OBJS, liblib.a)
20-
$(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/liblib.lib0.rcgu.o
20+
for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
2121

2222
staticlib-fat-lto: lib.rs
2323
$(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-fat-lto.a -Clto=fat
2424
$(call EXTRACT_OBJS, liblib-fat-lto.a)
25-
$(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/liblib-fat-lto.lib0.rcgu.o
25+
for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
2626

2727
staticlib-thin-lto: lib.rs
2828
$(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-thin-lto.a -Clto=thin
2929
$(call EXTRACT_OBJS, liblib-thin-lto.a)
30-
$(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/liblib-thin-lto.lib0.rcgu.o
30+
for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
3131

3232
rlib: lib.rs
3333
$(BUILD_LIB) --crate-type=rlib -o $(TMPDIR)/liblib.rlib
3434
$(call EXTRACT_OBJS, liblib.rlib)
35-
$(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/liblib.lib0.rcgu.o
35+
for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done
3636

3737
cdylib: lib.rs
3838
$(BUILD_LIB) --crate-type=cdylib --emit=obj -o $(TMPDIR)/cdylib.o

src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
all:
44
$(RUSTC) -C extra-filename=bar foo.rs -C save-temps
5-
rm $(TMPDIR)/foobar.foo0.rcgu.o
5+
rm $(TMPDIR)/foobar.foo*0.rcgu.o
66
rm $(TMPDIR)/$(call BIN,foobar)

0 commit comments

Comments
 (0)