[Cmake-commits] CMake branch, next, updated. v2.8.12-4481-gb4bc82d

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b4bc82d5c7fc124b1df1cc3cb7b1b27314f7f622 (commit)
       via  b84f5c2ef17c88441844896bf4b9f1e84da4d65e (commit)
      from  b48afdac1b4b512967295302aff10af37db3d8ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4bc82d5c7fc124b1df1cc3cb7b1b27314f7f622
commit b4bc82d5c7fc124b1df1cc3cb7b1b27314f7f622
Merge: b48afda b84f5c2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 25 01:02:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 25 01:02:22 2013 -0400

    Merge topic 'clang-binutils' into next
    
    b84f5c2 Find appropriate binutils when cross-compiling with clang


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b84f5c2ef17c88441844896bf4b9f1e84da4d65e
commit b84f5c2ef17c88441844896bf4b9f1e84da4d65e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Oct 20 13:32:23 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 25 07:01:38 2013 +0200

    Find appropriate binutils when cross-compiling with clang
    
    One way to use clang as a cross-compiler is to create
    a symlink named <target>-clang, which is equivalent to
    running
    
     clang -target <target>
    
    Extract the toolchain prefix to find the binutils executables.

diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index 8769c66..a1713ce 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -154,9 +154,9 @@ endif ()
 # "arm-unknown-nto-qnx6" instead of the correct "arm-unknown-nto-qnx6.3.0-"
 if (CMAKE_CROSSCOMPILING  AND NOT _CMAKE_TOOLCHAIN_PREFIX)
 
-  if("${CMAKE_C_COMPILER_ID}" MATCHES "GNU")
+  if("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
     get_filename_component(COMPILER_BASENAME "${CMAKE_C_COMPILER}" NAME)
-    if (COMPILER_BASENAME MATCHES "^(.+-)g?cc(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
+    if (COMPILER_BASENAME MATCHES "^(.+-)(clang|g?cc)(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
     endif ()
 
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index c79ba89..d28aa2c 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -152,9 +152,9 @@ endif ()
 
 if (CMAKE_CROSSCOMPILING  AND NOT  _CMAKE_TOOLCHAIN_PREFIX)
 
-  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     get_filename_component(COMPILER_BASENAME "${CMAKE_CXX_COMPILER}" NAME)
-    if (COMPILER_BASENAME MATCHES "^(.+-)[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
+    if (COMPILER_BASENAME MATCHES "^(.+-)(clan)?[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
     endif ()
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/CMakeDetermineCCompiler.cmake   |    4 ++--
 Modules/CMakeDetermineCXXCompiler.cmake |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake