[PATCH] [OCaml] fix tests in the CMake static library codepath

[Peter Zotov]

================
Comment at: CMakeLists.txt:150
@@ -149,2 +149,3 @@
 set(LLVM_LIBRARY_DIR      ${LLVM_LIBRARY_OUTPUT_INTDIR}) # --libdir
+set(LIBDIR                ${LLVM_LIBRARY_OUTPUT_INTDIR}) # alias for lit
 set(LLVM_MAIN_SRC_DIR     ${CMAKE_CURRENT_SOURCE_DIR}  ) # --src-root
----------------
I don't like how you add a non-namespaced variable, especially since another one with the identical value exists.

================
Comment at: cmake/modules/AddOCaml.cmake:55
@@ -54,3 +54,3 @@
 
-  set(ocaml_flags "-lstdc++" "-ldopt" "-L${LLVM_LIBRARY_OUTPUT_INTDIR}"
+  set(ocaml_flags "-lstdc++" "-L${LLVM_LIBRARY_DIR}"
                   ${ocaml_pkgs})
----------------
-ldopt is supposed to provide the path to the LLVM shared libraries to the ld command that links the OCaml stub shared library. It is simply not necessary for static linking.

================
Comment at: cmake/modules/AddOCaml.cmake:147
@@ -146,3 +146,3 @@
             "-I" "${bin}"
-            "-I" "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/"
+            "-I" "${LLVM_LIBRARY_DIR}/ocaml/"
             "-dump" "${bin}/${name}.odoc"
----------------
I don't see why this change is needed.

================
Comment at: cmake/modules/AddOCaml.cmake:195
@@ -194,3 +194,3 @@
       COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${install_file}"
-                                             "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/"
+                                             "${LLVM_LIBRARY_DIR}/ocaml/"
       COMMENT "Copying OCaml library component ${filename} to intermediate area"
----------------
I don't see why this change is needed.

http://reviews.llvm.org/D6806

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/