[Cmake-commits] CMake branch, next, updated. v3.0.1-5174-g54e59c8

[Brad King]

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  54e59c854510fc67e77f6f82483f755531d348a3 (commit)
       via  72d6681826840c0a14be61d19c71a55f280d38ae (commit)
      from  c9890b40693c28d37b607b33c9c00fe4ce9d02c4 (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=54e59c854510fc67e77f6f82483f755531d348a3
commit 54e59c854510fc67e77f6f82483f755531d348a3
Merge: c9890b4 72d6681
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 5 12:05:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 5 12:05:53 2014 -0400

    Merge topic 'fix-clang-cross-compile-find-binutils' into next
    
    72d66818 Fix finding binutils when cross-compiling with Clang

diff --cc Modules/CMakeDetermineCCompiler.cmake
index 3847b75,2b8ecdc..6b425c6
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@@ -136,9 -136,11 +136,11 @@@ if (CMAKE_CROSSCOMPILING  AND NOT _CMAK
      if (COMPILER_BASENAME MATCHES "^(.+-)(clang|g?cc)(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
        set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
      elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
-       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+       if(CMAKE_C_COMPILER_TARGET)
+         set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+       endif()
      elseif(COMPILER_BASENAME MATCHES "qcc(\\.exe)?$")
 -      if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
 +      if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?")
          set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
        endif()
      endif ()
diff --cc Modules/CMakeDetermineCXXCompiler.cmake
index e6a9d9a,9af1de1..893c454
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@@ -133,9 -133,11 +133,11 @@@ if (CMAKE_CROSSCOMPILING  AND NOT  _CMA
      if (COMPILER_BASENAME MATCHES "^(.+-)(clan)?[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
        set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
      elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+       if(CMAKE_CXX_COMPILER_TARGET)
+         set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+       endif()
      elseif(COMPILER_BASENAME MATCHES "QCC(\\.exe)?$")
 -      if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
 +      if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?")
          set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
        endif()
      endif ()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72d6681826840c0a14be61d19c71a55f280d38ae
commit 72d6681826840c0a14be61d19c71a55f280d38ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 5 11:59:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 5 12:06:27 2014 -0400

    Fix finding binutils when cross-compiling with Clang
    
    Since commit v3.0.0-rc1~342^2~2 (Add compiler target compile options,
    2013-05-19) we use CMAKE_<LANG>_COMPILER_TARGET as the binutils prefix
    when cross-compiling with Clang.  Fix the implementation to use the
    compiler target as the prefix only when it is set.  Otherwise toolchain
    files not using CMAKE_<LANG>_COMPILER_TARGET cause the logic to use
    a prefix of just "-" and of course cannot find "-ar" or "-ld".

diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index aa4cdc9..2b8ecdc 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -136,7 +136,9 @@ if (CMAKE_CROSSCOMPILING  AND NOT _CMAKE_TOOLCHAIN_PREFIX)
     if (COMPILER_BASENAME MATCHES "^(.+-)(clang|g?cc)(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
     elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
-      set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+      if(CMAKE_C_COMPILER_TARGET)
+        set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_C_COMPILER_TARGET}-)
+      endif()
     elseif(COMPILER_BASENAME MATCHES "qcc(\\.exe)?$")
       if(CMAKE_C_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
         set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake
index ef8445e..9af1de1 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -133,7 +133,9 @@ if (CMAKE_CROSSCOMPILING  AND NOT  _CMAKE_TOOLCHAIN_PREFIX)
     if (COMPILER_BASENAME MATCHES "^(.+-)(clan)?[gc]\\+\\+(-[0-9]+\\.[0-9]+\\.[0-9]+)?(\\.exe)?$")
       set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_MATCH_1})
     elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-      set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+      if(CMAKE_CXX_COMPILER_TARGET)
+        set(_CMAKE_TOOLCHAIN_PREFIX ${CMAKE_CXX_COMPILER_TARGET}-)
+      endif()
     elseif(COMPILER_BASENAME MATCHES "QCC(\\.exe)?$")
       if(CMAKE_CXX_COMPILER_TARGET MATCHES "gcc_nto([^_le]+)(le)?.*$")
         set(_CMAKE_TOOLCHAIN_PREFIX nto${CMAKE_MATCH_1}-)

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

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


hooks/post-receive
-- 
CMake