Skip to content

Commit c7d0b52

Browse files
committed
auto merge of #16434 : vadimcn/rust/many-crates-but-no-match, r=alexcrichton
2 parents c1eaafe + 06d44aa commit c7d0b52

File tree

1 file changed

+2
-2
lines changed
  • src/test/run-make/many-crates-but-no-match

1 file changed

+2
-2
lines changed

src/test/run-make/many-crates-but-no-match/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ all:
2020
mkdir -p $(A1) $(A2) $(A3)
2121
$(RUSTC) --crate-type=rlib crateA1.rs
2222
mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A1)
23-
$(RUSTC) --crate-type=rlib -L$(A1) crateB.rs
23+
$(RUSTC) --crate-type=rlib -L $(A1) crateB.rs
2424
$(RUSTC) --crate-type=rlib crateA2.rs
2525
mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A2)
2626
$(RUSTC) --crate-type=rlib crateA3.rs
2727
mv $(TMPDIR)/$(call RLIB_GLOB,crateA) $(A3)
2828
# Ensure crateC fails to compile since A1 is "missing" and A2/A3 hashes do not match
29-
$(RUSTC) -L$(A2) -L$(A3) crateC.rs >$(LOG) 2>&1 || true
29+
$(RUSTC) -L $(A2) -L $(A3) crateC.rs >$(LOG) 2>&1 || true
3030
grep "error: found possibly newer version of crate \`crateA\` which \`crateB\` depends on" $(LOG)
3131
grep "note: perhaps this crate needs to be recompiled?" $(LOG)
3232
grep "note: crate \`crateA\` path #1:" $(LOG)

0 commit comments

Comments
 (0)