Switch to clang++ (sebastianbergmann)

weyrick · Feb 6, 2012 · 5f1abec · 5f1abec
1 parent 415d6a6
commit 5f1abec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/c-runtime/CMakeLists.txt b/c-runtime/CMakeLists.txt
@@ -3,7 +3,7 @@
 MESSAGE( STATUS "c-runtime check" )
 
 add_custom_command(
-   COMMAND ${LLVM_GXX_EXECUTABLE}
+   COMMAND ${LLVM_CLANGXX_EXECUTABLE}
    ARGS -I/usr/local/include -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -fPIC -emit-llvm -I${ICU_INCLUDE_DIRS} -I${Boost_INCLUDE_DIRS} -I${RPHP_INCLUDE_DIR} -I${LLVM_INCLUDE_DIR} -c -o ${RPHP_LIB_DIR}/c-runtime.bc  ${CMAKE_CURRENT_SOURCE_DIR}/c-runtime.cpp ${LLVM_COMPILE_FLAGS}
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/c-runtime.cpp
    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/c-runtime.h

diff --git a/cmake/modules/FindLLVM.cmake b/cmake/modules/FindLLVM.cmake
@@ -23,17 +23,17 @@ else (LLVM_INCLUDE_DIR)
       /opt/local/bin
   )
 
-  find_program(LLVM_GXX_EXECUTABLE
-      NAMES llvm-g++ llvmg++
+  find_program(LLVM_CLANGXX_EXECUTABLE
+      NAMES clang++
       PATHS
       /opt/local/bin
   )
 
-  if (LLVM_GXX_EXECUTABLE)
-      MESSAGE(STATUS "LLVM llvm-g++ found at: ${LLVM_GXX_EXECUTABLE}")
-  else(LLVM_GXX_EXECUTABLE)
-      MESSAGE(FATAL_ERROR "LLVM llvm-g++ is required, but not found!")
-  endif(LLVM_GXX_EXECUTABLE)
+  if (LLVM_CLANGXX_EXECUTABLE)
+      MESSAGE(STATUS "LLVM clang++ found at: ${LLVM_CLANGXX_EXECUTABLE}")
+  else(LLVM_CLANGXX_EXECUTABLE)
+      MESSAGE(FATAL_ERROR "LLVM clang++ is required, but not found!")
+  endif(LLVM_CLANGXX_EXECUTABLE)
 
   MACRO(FIND_LLVM_LIBS LLVM_CONFIG_EXECUTABLE _libname_ LIB_VAR OBJECT_VAR)
     exec_program( ${LLVM_CONFIG_EXECUTABLE} ARGS --libs ${_libname_}  OUTPUT_VARIABLE ${LIB_VAR} )