nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #9393 : alexcrichton/rust/fix-docs, r=brson

Browse Source 
This needs libstd in its proper location to resolve references when generating
docs for libextra.
This commit is contained in:
bors 2013-09-21 13:30:57 -07:00
commit 5b3dfb0fe8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mk/docs.mk
View File

@ -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