From 80920da6b97a04a2720cbe99e6e194e52d7cfc4a Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 6 Feb 2014 15:43:27 -0800 Subject: [PATCH] Don't include rpath lines in dependency lists The rpath variable should only be used when executing commands, if it leaks into a dependency list is causes havoc with the dependencies. --- mk/docs.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mk/docs.mk b/mk/docs.mk index a5577c27308..698c5590af6 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -281,8 +281,7 @@ endif # The rustdoc executable, rpath included in case --disable-rpath was provided to # ./configure -RUSTDOC = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \ - $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD)) +RUSTDOC = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD)) # The library documenting macro # @@ -297,7 +296,9 @@ doc/$(1)/index.html: \ $$(foreach dep,$$(RUST_DEPS_$(1)), \ $$(TLIB2_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.$$(dep)) @$$(call E, rustdoc: $$@) - $$(Q)$$(RUSTDOC) --cfg stage2 $$< + $$(Q)$$(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $$(RUSTDOC) \ + --cfg stage2 $$< + endef $(foreach crate,$(CRATES),$(eval $(call libdoc,$(crate))))