[llvm] r221140 - [OCaml] Fix ocamlc -custom builds when configured as --enable-shared.

Peter Zotov whitequark at whitequark.org
Mon Nov 3 01:51:38 PST 2014


Author: whitequark
Date: Mon Nov  3 03:51:37 2014
New Revision: 221140

URL: http://llvm.org/viewvc/llvm-project?rev=221140&view=rev
Log:
[OCaml] Fix ocamlc -custom builds when configured as --enable-shared.

Modified:
    llvm/trunk/bindings/ocaml/Makefile.ocaml

Modified: llvm/trunk/bindings/ocaml/Makefile.ocaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/Makefile.ocaml?rev=221140&r1=221139&r2=221140&view=diff
==============================================================================
--- llvm/trunk/bindings/ocaml/Makefile.ocaml (original)
+++ llvm/trunk/bindings/ocaml/Makefile.ocaml Mon Nov  3 03:51:37 2014
@@ -90,8 +90,9 @@ Compile.CMO  := $(strip $(OCAMLFIND) c -
 Compile.CMX  := $(strip $(OCAMLFIND) opt -c $(OCAMLCFLAGS) $(OCAMLDEBUGFLAG) -o)
 
 ifdef OCAMLSTUBS
-Archive.CMA  := $(strip $(OCAMLFIND) c -a -dllib -l$(LIBRARYNAME) $(OCAMLDEBUGFLAG) \
-                                       -o)
+# -dllib is engaged with ocamlc builds, $(OCAMLSTUBFLAGS) in ocamlc -custom builds.
+Archive.CMA  := $(strip $(OCAMLFIND) c -a -dllib -l$(LIBRARYNAME) $(OCAMLSTUBFLAGS) \
+																			 $(OCAMLDEBUGFLAG) -o)
 else
 Archive.CMA  := $(strip $(OCAMLFIND) c -a -custom $(OCAMLAFLAGS) $(OCAMLDEBUGFLAG) \
                                        -o)





More information about the llvm-commits mailing list