From 82b23be3c1c79b2326964ae6aa4eebd788bab691 Mon Sep 17 00:00:00 2001 From: Will Crichton Date: Fri, 5 Nov 2021 09:32:04 -0700 Subject: [PATCH] Fix rustdoc-scrape-examples-macros test not being cross-platform --- .../run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile b/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile index 2ed6f0edd6a..4934e875da6 100644 --- a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile @@ -1,6 +1,7 @@ -include ../../run-make-fulldeps/tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" +DYLIB_NAME := $(shell echo | $(RUSTC) --crate-name foobar_macro --crate-type dylib --print file-names -) all: $(RUSTC) src/proc.rs --crate-name foobar_macro --edition=2021 --crate-type proc-macro --emit=dep-info,link @@ -8,7 +9,7 @@ all: $(RUSTC) src/lib.rs --crate-name foobar --edition=2021 --crate-type lib --emit=dep-info,link $(RUSTDOC) examples/ex.rs --crate-name ex --crate-type bin --output $(OUTPUT_DIR) \ - --extern foobar=$(TMPDIR)/libfoobar.rlib --extern foobar_macro=$(TMPDIR)/libfoobar_macro.so \ + --extern foobar=$(TMPDIR)/libfoobar.rlib --extern foobar_macro=$(TMPDIR)/$(DYLIB_NAME) \ -Z unstable-options --scrape-examples-output-path $(TMPDIR)/ex.calls --scrape-examples-target-crate foobar $(RUSTDOC) src/lib.rs --crate-name foobar --crate-type lib --output $(OUTPUT_DIR) \