Skip to content

Commit a27934c

Browse files
committed
auto merge of #12076 : alexcrichton/rust/rpath-makefile-dep, r=thestinger
The rpath variable should only be used when executing commands, if it leaks into a dependency list is causes havoc with the dependencies.
2 parents 87fe3cc + 80920da commit a27934c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

mk/docs.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,7 @@ endif
275275

276276
# The rustdoc executable, rpath included in case --disable-rpath was provided to
277277
# ./configure
278-
RUSTDOC = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
279-
$(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
278+
RUSTDOC = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
280279

281280
# The library documenting macro
282281
#
@@ -291,7 +290,9 @@ doc/$(1)/index.html: \
291290
$$(foreach dep,$$(RUST_DEPS_$(1)), \
292291
$$(TLIB2_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.$$(dep))
293292
@$$(call E, rustdoc: $$@)
294-
$$(Q)$$(RUSTDOC) --cfg stage2 $$<
293+
$$(Q)$$(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $$(RUSTDOC) \
294+
--cfg stage2 $$<
295+
295296
endef
296297

297298
$(foreach crate,$(CRATES),$(eval $(call libdoc,$(crate))))

0 commit comments

Comments
 (0)