diff options
| author | Sébastien Marie <semarie@users.noreply.github.com> | 2018-03-18 18:08:17 +0100 |
|---|---|---|
| committer | Sébastien Marie <semarie@users.noreply.github.com> | 2018-03-18 18:08:17 +0100 |
| commit | e269a7435e80e0c4e02e3a5aa21233ef28892def (patch) | |
| tree | 4f9eb14680575f52d471a3f383e2a2dd12889af5 | |
| parent | 8aa27ee30972f16320ae4a8887c8f54616fff819 (diff) | |
| download | rust-e269a7435e80e0c4e02e3a5aa21233ef28892def.tar.gz rust-e269a7435e80e0c4e02e3a5aa21233ef28892def.zip | |
Allow test target to pass without installing
explicitly pass -L target-lib to rustdoc
| -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 953a13a3f58..23bb39215d3 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) |