diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-22 17:51:26 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-03-22 22:43:38 +0800 |
| commit | 20eaf351a20d1ac1ff2de9abc80fe7bff9737843 (patch) | |
| tree | d2708c1bb60327d6f9aa93ae1a25da2659abd113 | |
| parent | 8d3f3f0cac3de7dfbb126db3c48d7499c96d86ec (diff) | |
| parent | e269a7435e80e0c4e02e3a5aa21233ef28892def (diff) | |
Rollup merge of #49140 - semarie:rustdoc-test-path, r=alexcrichton
Allow test target to pass without installing explicitly pass -L target-lib to rustdoc on OpenBSD, without it, it fails on several tests with: ``` error[E0463]: can't find crate for `std` ```
| -rw-r--r-- | src/test/run-make/tools.mk | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/run-make/tools.mk b/src/test/run-make/tools.mk index d9103e19927..af1707de6c0 100644 --- a/src/test/run-make/tools.mk +++ b/src/test/run-make/tools.mk @@ -9,7 +9,7 @@ RUSTC_ORIGINAL := $(RUSTC) BARE_RUSTC := $(HOST_RPATH_ENV) '$(RUSTC)' BARE_RUSTDOC := $(HOST_RPATH_ENV) '$(RUSTDOC)' RUSTC := $(BARE_RUSTC) --out-dir $(TMPDIR) -L $(TMPDIR) $(RUSTFLAGS) -RUSTDOC := $(BARE_RUSTDOC) +RUSTDOC := $(BARE_RUSTDOC) -L $(TARGET_RPATH_DIR) ifdef RUSTC_LINKER RUSTC := $(RUSTC) -Clinker=$(RUSTC_LINKER) RUSTDOC := $(RUSTDOC) --linker $(RUSTC_LINKER) -Z unstable-options diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index ee348cddb3c..43220af4893 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -1325,6 +1325,8 @@ impl<'test> TestCx<'test> { rustdoc .arg("-L") + .arg(self.config.run_lib_path.to_str().unwrap()) + .arg("-L") .arg(aux_dir) .arg("-o") .arg(out_dir) |