[Cmake-commits] CMake branch, next, updated. v3.3.0-1574-gd42ee02

Brad King brad.king at kitware.com
Thu Jul 30 14:23:39 EDT 2015


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  d42ee02881817f90451a6fdb0f983ab5fd56a3e5 (commit)
       via  60fe4b540b40330e050dbd755204cecbc62d6a37 (commit)
      from  fdc227c297b54f0f7e8c158cdc6bb3ccdc8f01d4 (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=d42ee02881817f90451a6fdb0f983ab5fd56a3e5
commit d42ee02881817f90451a6fdb0f983ab5fd56a3e5
Merge: fdc227c 60fe4b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 30 14:23:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 30 14:23:38 2015 -0400

    Merge topic 'SunOS-link-CXX-normally' into next
    
    60fe4b54 SunOS: Drop special case for linking C++ shared libraries with gcc (#15673)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60fe4b540b40330e050dbd755204cecbc62d6a37
commit 60fe4b540b40330e050dbd755204cecbc62d6a37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 30 13:57:22 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 30 13:59:29 2015 -0400

    SunOS: Drop special case for linking C++ shared libraries with gcc (#15673)
    
    Since commit v2.4.0~4325 (...use gcc -shared, even for C++ libraries,
    2003-03-13) we use the C compiler "gcc" to link C++ shared libraries
    compiled with "g++".  At the time "g++" did not know how to link shared
    libraries correctly.  This has long since been fixed so simply drop the
    special case.

diff --git a/Modules/Platform/SunOS.cmake b/Modules/Platform/SunOS.cmake
index aaa79c4..77946f2 100644
--- a/Modules/Platform/SunOS.cmake
+++ b/Modules/Platform/SunOS.cmake
@@ -7,14 +7,6 @@ if(CMAKE_SYSTEM MATCHES "SunOS-4")
    set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 endif()
 
-if(CMAKE_COMPILER_IS_GNUCXX)
-  if(CMAKE_COMPILER_IS_GNUCC)
-    set(CMAKE_CXX_CREATE_SHARED_LIBRARY
-        "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-  else()
-    # Take default rule from CMakeDefaultMakeRuleVariables.cmake.
-  endif()
-endif()
 include(Platform/UnixPaths)
 
 # Add the compiler's implicit link directories.

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

Summary of changes:
 Modules/Platform/SunOS.cmake |    8 --------
 1 file changed, 8 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list