Merge lp:~davidagraf/zorba/detect-clang-properly into lp:zorba

[David Graf]

Since OSX Mountain Lion, clang is the default c++ compiler on mac. Therefore, it is not enough to check if the c++ compiler executable is called clang.

Since OSX Mountain Lion, clang is the default c++ compiler on mac. Therefore, it is not enough to check if the c++ compiler executable is called clang.

[lp:~davidagraf/zorba/detect-clang-properly]

10942. By David Graf on 2012-08-02

detect clang properly

[Paul J. Lucas (paul-lucas)]

gcc --version only output the string "llvm" or "LLVM" and not "clang. You should check for "LLVM" and not "clang".

$ gcc --version
i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2336.11.00)
Copyright (C) 2007 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

[Paul J. Lucas (paul-lucas)]

review: Needs Fixing

[David Graf (davidagraf)]

Hey Paul

According to http://llvm.org/releases/2.6/docs/CommandGuide/html/llvmgxx.html, llvm-g++ behaves like g++. It's a different C and C++ front-end for the LLVM compiler then clang. So, I still think we need to check the compiler frontend (clang or gcc) and not the backend (llvm).

David

[Paul J. Lucas (paul-lucas)]

Isn't the name of the clang C++ = "clang++"? Does MATCHES do partial or exact matches?

[David Graf (davidagraf)]

Match does partial matches. c++ --version does return much more then 'clang' :-).

[Paul J. Lucas (paul-lucas)]

review: Approve

[David Graf (davidagraf)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/detect-clang-properly-2012-08-09T09-52-00.038Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job detect-clang-properly-2012-08-09T09-52-00.038Z is finished. The final status was:

All tests succeeded!

=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt	2012-07-24 08:48:48 +0000
+++ CMakeCompiler.txt	2012-08-02 21:16:20 +0000
@@ -13,11 +13,18 @@
 # limitations under the License. 
 
 
-IF (${CMAKE_CXX_COMPILER} MATCHES "clang")
- SET (CLANG 1)
-ELSE (${CMAKE_CXX_COMPILER} MATCHES "clang")
- SET (CLANG 0)
-ENDIF(${CMAKE_CXX_COMPILER} MATCHES "clang")
+# check if clang is used to compile c++
+EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+               ARGS --version
+               OUTPUT_VARIABLE CXX_COMPILER_VERSION_OUTPUT
+)
+STRING(REGEX MATCH "clang"
+  CXX_IS_CLANG "${CXX_COMPILER_VERSION_OUTPUT}")
+IF (CXX_IS_CLANG)
+  SET (CLANG 1)
+ELSE ()
+  SET (CLANG 0)
+ENDIF ()
 
 #-----------------------------------------------------------------------------
 # Let's use the highest warning level.