Changeset 3027

Timestamp:

02/12/15 20:19:21 (9 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/No?

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Do not use linker option -s for build on OS X 10.8 since it causes link error.

File:

• trunk/CMakeLists.txt (modified) (1 diff)

trunk/CMakeLists.txt

@@ -65 +65 @@
 set( CMAKE_CXX_FLAGS_PROFILE "-g -O2 -pg -fprofile-arcs -fno-omit-frame-pointer" )
 
-# flags for Release build
-set( CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s" )
-set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-s" )
-
-# flags for MinSizeRel build
-set( CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "-Wl,-s" )
-set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,-s" )
+
+# flags for Release and MinSizeRel build
+if ( APPLE )
+    # OS X
+    # On 10.8 (Darwin-12) with llvm clang, -s option for linker
+    # causes link error. This may be because that -s option is 
+    # obsolete and is different behavior from Linux.
+    if ( CMAKE_SYSTEM MATCHES ^Darwin-11 AND NOT LLVMCOMPILER )
+        set( CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s" )
+        set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-s" )
+        set( CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "-Wl,-s" )
+        set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,-s" )
+    endif()
+else()
+    # Linux
+    set( CMAKE_SHARED_LINKER_FLAGS_RELEASE "-Wl,-s" )
+    set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-s" )
+    set( CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "-Wl,-s" )
+    set( CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "-Wl,-s" )
+endif()
 
 if ( DEFINED CXX_FLAGS_TAIL_END )