mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #12076 : alexcrichton/rust/rpath-makefile-dep, r=thestinger

Browse Source 
The rpath variable should only be used when executing commands, if it leaks into
a dependency list is causes havoc with the dependencies.
This commit is contained in:
bors 2014-02-06 19:16:34 -08:00
commit a27934c555
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mk/docs.mk
View File

@ -275,8 +275,7 @@ endif
# The rustdoc executable, rpath included in case --disable-rpath was provided to # The rustdoc executable, rpath included in case --disable-rpath was provided to
# ./configure # ./configure
RUSTDOC = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \ RUSTDOC = $(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
$(HBIN2_H_$(CFG_BUILD))/rustdoc$(X_$(CFG_BUILD))
# The library documenting macro # The library documenting macro
# #
@ -291,7 +290,9 @@ doc/$(1)/index.html: \
$$(foreach dep,$$(RUST_DEPS_$(1)), \ $$(foreach dep,$$(RUST_DEPS_$(1)), \
$$(TLIB2_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.$$(dep)) $$(TLIB2_T_$(CFG_BUILD)_H_$(CFG_BUILD))/stamp.$$(dep))
@$$(call E, rustdoc: $$@) @$$(call E, rustdoc: $$@)
$$(Q)$$(RUSTDOC) --cfg stage2 $$< $$(Q)$$(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $$(RUSTDOC) \
--cfg stage2 $$<
endef endef
$(foreach crate,$(CRATES),$(eval $(call libdoc,$(crate)))) $(foreach crate,$(CRATES),$(eval $(call libdoc,$(crate))))