[llvm] r220831 - [OCaml] PR14083, PR9606: Only pick *.odoc files from current build target.
Peter Zotov
whitequark at whitequark.org
Tue Oct 28 15:45:25 PDT 2014
Author: whitequark
Date: Tue Oct 28 17:45:25 2014
New Revision: 220831
URL: http://llvm.org/viewvc/llvm-project?rev=220831&view=rev
Log:
[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.
Modified:
llvm/trunk/docs/Makefile
Modified: llvm/trunk/docs/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/Makefile?rev=220831&r1=220830&r2=220831&view=diff
==============================================================================
--- llvm/trunk/docs/Makefile (original)
+++ llvm/trunk/docs/Makefile Tue Oct 28 17:45:25 2014
@@ -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
More information about the llvm-commits
mailing list