about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-28 18:21:34 -0700
committerbors <bors@rust-lang.org>2014-05-28 18:21:34 -0700
commit812785e01aef46b0c62bfc02080f8fcc13f01a4c (patch)
tree7be92f022bac2abee46ba87c8a23c156f72f0945
parentaa151956a7e5376818ac5d3aadba8cc2bad30925 (diff)
parent213d54e06c1b99bb8d542ed3a3103419fd1c95e7 (diff)
auto merge of #14476 : luqmana/rust/docs, r=alexcrichton
We were still generating compiler docs even with --disable-docs passed.

cc @pnkfelix
-rw-r--r--mk/docs.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/mk/docs.mk b/mk/docs.mk
index 91ff72ed2b5..5a00ad6f7e8 100644
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -287,6 +287,7 @@ $(foreach crate,$(COMPILER_DOC_CRATES),$(eval $(call DEF_LIB_DOC,$(crate),COMPIL
 ifdef CFG_DISABLE_DOCS
   $(info cfg: disabling doc build (CFG_DISABLE_DOCS))
   DOC_TARGETS :=
+  COMPILER_DOC_TARGETS :=
 endif
 
 docs: $(DOC_TARGETS)