[OCaml] fix tests in the CMake static library codepath

[artagnon]

Summary

OCaml bindings built statically with CMake are good for nothing, as
shown by the test failures. Make two changes to make tests pass:

1. Fix AddOCaml CMake rule to link in the case of static lib.
2. Add the LIBDIR variable required by lit.cfg.

Signed-off-by: Ramkumar Ramachandra <[e-mail]>

[whitequark]

CMakeLists.txt

150

I don't like how you add a non-namespaced variable, especially since another one with the identical value exists.

cmake/modules/AddOCaml.cmake

55

-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.

147

I don't see why this change is needed.

195

I don't see why this change is needed.

[whitequark]

Refactored to be non-invasive and committed in rL224977 and rL224978.

CMakeLists.txt

if(WIN32 OR CYGWIN)
   set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
 else()
   set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_LIBRARY_OUTPUT_INTDIR})
 endif()
 
 # Each of them corresponds to llvm-config's.
 set(LLVM_TOOLS_BINARY_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) # --bindir
 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
 set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include ) # --includedir
 set(LLVM_BINARY_DIR       ${CMAKE_CURRENT_BINARY_DIR}  ) # --prefix
 
 set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples)
 set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include)
 
 set(LLVM_ALL_TARGETS

cmake/modules/AddOCaml.cmake

if( ARG_C )
     endif()
   endif()
   if( HAVE_OCAMLOPT )
     list(APPEND ocaml_outputs
          "${bin}/${name}.cmxa"
          "${bin}/${name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
   endif()
 
-  set(ocaml_flags "-lstdc++" "-ldopt" "-L${LLVM_LIBRARY_OUTPUT_INTDIR}"
+  set(ocaml_flags "-lstdc++" "-L${LLVM_LIBRARY_DIR}"
                   ${ocaml_pkgs})
 
   foreach( ocaml_dep ${ARG_OCAMLDEP} )
     get_target_property(dep_ocaml_flags "ocaml_${ocaml_dep}" OCAML_FLAGS)
     list(APPEND ocaml_flags ${dep_ocaml_flags})
   endforeach()
 
   if( NOT BUILD_SHARED_LIBS )
add_custom_command(
     DEPENDS ${ocaml_inputs} ${c_outputs}
     COMMENT "Building OCaml library ${name}"
     VERBATIM)
 
   add_custom_command(
     OUTPUT "${bin}/${name}.odoc"
     COMMAND "${OCAMLFIND}" "ocamldoc"
             "-I" "${bin}"
-            "-I" "${LLVM_LIBRARY_OUTPUT_INTDIR}/ocaml/"
+            "-I" "${LLVM_LIBRARY_DIR}/ocaml/"
             "-dump" "${bin}/${name}.odoc"
             ${ocaml_pkgs} ${ocaml_inputs}
     DEPENDS ${ocaml_inputs}
     COMMENT "Building OCaml documentation for ${name}"
     VERBATIM)
 
   add_custom_target("ocaml_${name}" ALL DEPENDS ${ocaml_outputs} "${bin}/${name}.odoc")
 
install(FILES ${install_shlibs}
                       GROUP_READ GROUP_EXECUTE
                       WORLD_READ WORLD_EXECUTE
           DESTINATION lib/ocaml)
 
   foreach( install_file ${install_files} ${install_shlibs} )
     get_filename_component(filename "${install_file}" NAME)
     add_custom_command(TARGET "ocaml_${name}" POST_BUILD
       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"
       VERBATIM)
   endforeach()
 endfunction()