diff options
| author | bors <bors@rust-lang.org> | 2013-09-21 13:30:57 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-21 13:30:57 -0700 |
| commit | 5b3dfb0fe8f4629d2d220d4419aaea81ab7d2963 (patch) | |
| tree | 8396ab0e0ac3198356cda81e7807dd73df4c3707 | |
| parent | 44dc3fba8b10e066056a03f5444729d2e38596dc (diff) | |
| parent | 02b27b2998d5722860f0c15e6b464edd517f0842 (diff) | |
auto merge of #9393 : alexcrichton/rust/fix-docs, r=brson
This needs libstd in its proper location to resolve references when generating docs for libextra.
| -rw-r--r-- | mk/docs.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/docs.mk b/mk/docs.mk index c214823476d..d7b5d6855ad 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -231,12 +231,12 @@ doc/$(1)/rust.css: rust.css DOCS += doc/$(1)/index.html endef -# The library documenting macro -# $(1) - The output directory +# The "next generation" library documenting macro +# $(1) - The crate name (std/extra) # $(2) - The crate file -# $(3) - The crate soruce files +# $(3) - The relevant host build triple (to depend on libstd) define libdocng -doc/ng/$(1)/index.html: $(2) $(3) $$(RUSTDOC_NG) +doc/ng/$(1)/index.html: $$(RUSTDOC_NG) $$(TLIB2_T_$(3)_H_$(3))/$(CFG_STDLIB_$(3)) @$$(call E, rustdoc_ng: $$@) $(Q)$(RUSTDOC_NG) html $(2) -o doc/ng @@ -245,8 +245,8 @@ endef $(eval $(call libdoc,std,$(STDLIB_CRATE),$(STDLIB_INPUTS))) $(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS))) -$(eval $(call libdocng,std,$(STDLIB_CRATE),$(STDLIB_INPUTS))) -$(eval $(call libdocng,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS))) +$(eval $(call libdocng,std,$(STDLIB_CRATE),$(CFG_BUILD_TRIPLE))) +$(eval $(call libdocng,extra,$(EXTRALIB_CRATE),$(CFG_BUILD_TRIPLE))) endif |