summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zotov <whitequark@whitequark.org>2014-10-28 22:45:25 +0000
committerPeter Zotov <whitequark@whitequark.org>2014-10-28 22:45:25 +0000
commit5df08c89380c3afbbbbc31b15fa18fc2bc8adacc (patch)
tree68c808f2a193def57de1a8a4a15addf6f831b4f7
parente15b00492271fb1bc50a539f5a6b3a8f9db3e1b2 (diff)
downloadbcm5719-llvm-5df08c89380c3afbbbbc31b15fa18fc2bc8adacc.tar.gz
bcm5719-llvm-5df08c89380c3afbbbbc31b15fa18fc2bc8adacc.zip
[OCaml] PR14083, PR9606: Only pick *.odoc files from current build target.
When several build targets, e.g. Debug+Asserts and Release+Asserts are present, ocamldoc complains of duplicate interfaces. llvm-svn: 220831
-rw-r--r--llvm/docs/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/docs/Makefile b/llvm/docs/Makefile
index d973af583e0..690f7726b73 100644
--- a/llvm/docs/Makefile
+++ b/llvm/docs/Makefile
@@ -1,10 +1,10 @@
##===- docs/Makefile ---------------------------------------*- Makefile -*-===##
-#
+#
# The LLVM Compiler Infrastructure
#
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
-#
+#
##===----------------------------------------------------------------------===##
LEVEL := ..
@@ -121,7 +121,8 @@ regen-ocamldoc:
$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
$(Verb) \
$(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
- `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" -exec echo -load '{}' ';'`
+ `$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \
+ -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`
uninstall-local::
$(Echo) Uninstalling Documentation
OpenPOWER on IntegriCloud