Skip to content

Commit

Permalink
Don't include rpath lines in dependency lists
Browse files Browse the repository at this point in the history 
The rpath variable should only be used when executing commands, if it leaks into
a dependency list is causes havoc with the dependencies.
  • Loading branch information
@alexcrichton
alexcrichton committed Feb 7, 2014
1 parent c13a929 commit 80920da
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions mk/docs.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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))))
Expand Down

5 comments on commit 80920da

@bors
Copy link
Contributor

@bors bors commented on 80920da Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from thestinger
at alexcrichton@80920da

@bors
Copy link
Contributor

@bors bors commented on 80920da Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/rpath-makefile-dep = 80920da into auto

@bors
Copy link
Contributor

@bors bors commented on 80920da Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/rpath-makefile-dep = 80920da merged ok, testing candidate = a27934c

@bors
Copy link
Contributor

@bors bors commented on 80920da Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4070
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1912
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1914
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4070
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/3170
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/3176
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/4085
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/3173
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/3179
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/4087
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/3173
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/3178
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/3247
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1025
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/4078
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/3179
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/3184
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3847

@bors
Copy link
Contributor

@bors bors commented on 80920da Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = a27934c

Please sign in to comment.