[llvm] r309364 - Revert rL309320 - "[OCaml] Respect CMAKE_C_FLAGS for OCaml C files"

Michal Gorny via llvm-commits llvm-commits at lists.llvm.org
Thu Jul 27 21:29:20 PDT 2017


Author: mgorny
Date: Thu Jul 27 21:29:20 2017
New Revision: 309364

URL: http://llvm.org/viewvc/llvm-project?rev=309364&view=rev
Log:
Revert rL309320 - "[OCaml] Respect CMAKE_C_FLAGS for OCaml C files"

This causes buildbot breakage for systems where OCaml files are built
with a different compiler.

Modified:
    llvm/trunk/cmake/modules/AddOCaml.cmake

Modified: llvm/trunk/cmake/modules/AddOCaml.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddOCaml.cmake?rev=309364&r1=309363&r2=309364&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddOCaml.cmake (original)
+++ llvm/trunk/cmake/modules/AddOCaml.cmake Thu Jul 27 21:29:20 2017
@@ -83,7 +83,7 @@ function(add_ocaml_library name)
   endforeach()
 
   string(REPLACE ";" " " ARG_CFLAGS "${ARG_CFLAGS}")
-  set(c_flags "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${ARG_CFLAGS} ${LLVM_DEFINITIONS}")
+  set(c_flags "${ARG_CFLAGS} ${LLVM_DEFINITIONS}")
   foreach( include_dir ${LLVM_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR} )
     set(c_flags "${c_flags} -I${include_dir}")
   endforeach()




More information about the llvm-commits mailing list