[llvm] r194772 - [OCaml] Fix building of stub libraries

[Peter Zotov]

Author: whitequark
Date: Thu Nov 14 20:51:27 2013
New Revision: 194772

URL: http://llvm.org/viewvc/llvm-project?rev=194772&view=rev
Log:
[OCaml] Fix building of stub libraries

Modified:
    llvm/trunk/bindings/ocaml/Makefile
    llvm/trunk/bindings/ocaml/Makefile.ocaml
    llvm/trunk/bindings/ocaml/backends/backend_ocaml.c

Modified: llvm/trunk/bindings/ocaml/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/Makefile?rev=194772&r1=194771&r2=194772&view=diff
==============================================================================
--- llvm/trunk/bindings/ocaml/Makefile (original)
+++ llvm/trunk/bindings/ocaml/Makefile Thu Nov 14 20:51:27 2013
@@ -9,7 +9,7 @@
 
 LEVEL := ../..
 DIRS = llvm bitreader bitwriter irreader analysis target executionengine \
-       transforms linker
+       transforms linker backends
 ExtraMakefiles = $(PROJ_OBJ_DIR)/Makefile.ocaml
 
 ocamldoc:

Modified: llvm/trunk/bindings/ocaml/Makefile.ocaml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/Makefile.ocaml?rev=194772&r1=194771&r2=194772&view=diff
==============================================================================
--- llvm/trunk/bindings/ocaml/Makefile.ocaml (original)
+++ llvm/trunk/bindings/ocaml/Makefile.ocaml Thu Nov 14 20:51:27 2013
@@ -142,7 +142,7 @@ OutputCMXA := $(LibraryCMXA:$(ObjDir)/%.
 endif
 
 ifdef OCAMLSTUBS
-SharedLib := $(OcamlDir)/dll$(LIBRARYNAME).$(SHLIBEXT)
+SharedLib := $(OcamlDir)/dll$(LIBRARYNAME)$(SHLIBEXT)
 endif
 
 ifdef TOOLNAME
@@ -163,7 +163,7 @@ DestCMXA := $(PROJ_libocamldir)/$(LIBRAR
 endif
 
 ifdef OCAMLSTUBS
-DestSharedLib := $(PROJ_libocamldir)/dll$(LIBRARYNAME).$(SHLIBEXT)
+DestSharedLib := $(PROJ_libocamldir)/dll$(LIBRARYNAME)$(SHLIBEXT)
 endif
 
 ##===- Dependencies -------------------------------------------------------===##

Modified: llvm/trunk/bindings/ocaml/backends/backend_ocaml.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/backends/backend_ocaml.c?rev=194772&r1=194771&r2=194772&view=diff
==============================================================================
--- llvm/trunk/bindings/ocaml/backends/backend_ocaml.c (original)
+++ llvm/trunk/bindings/ocaml/backends/backend_ocaml.c Thu Nov 14 20:51:27 2013
@@ -19,16 +19,16 @@
 #include "caml/alloc.h"
 #include "caml/memory.h"
 
+// TODO: Figure out how to call these only for targets which support them.
+// LLVMInitialize ## target ## AsmPrinter();
+// LLVMInitialize ## target ## AsmParser();
+// LLVMInitialize ## target ## Disassembler();
+
 #define INITIALIZER1(target) \
   CAMLprim value llvm_initialize_ ## target(value Unit) {  \
     LLVMInitialize ## target ## TargetInfo();              \
     LLVMInitialize ## target ## Target();                  \
     LLVMInitialize ## target ## TargetMC();                \
-    // TODO: Figure out how to call these only for targets \
-    // which support them.                                 \
-    // LLVMInitialize ## target ## AsmPrinter();           \
-    // LLVMInitialize ## target ## AsmParser();            \
-    // LLVMInitialize ## target ## Disassembler();         \
     return Val_unit;                                       \
   }