Skip to content

Commit ea3eff8

Browse files
author
Tor Didriksen
committed
Bug#24303829 ADD SUPPORT FOR SOLARIS STUDIO 12.5 AKA 5.14 TO MYSQL 5.6
Parse new output from 'CC -V' Remove '-Xa' from COMMON_C_FLAGS (prefer ISO C rather than K&R C semantics) It is not needed, and it cannot be used together with the -std=xxx flag. This is a partial backport of the fix for: Bug#23212938 ADD SUPPORT FOR SOLARIS STUDIO 12.5 AKA 5.14
1 parent bbb1b3f commit ea3eff8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

cmake/build_configurations/compiler_options.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ IF(UNIX)
8282
ENDIF()
8383
ELSE()
8484
# Assume !x86 is SPARC
85-
SET(COMMON_C_FLAGS "-g -Xa -xstrconst -mt")
85+
SET(COMMON_C_FLAGS "-g -xstrconst -mt")
8686
SET(COMMON_CXX_FLAGS "-g0 -mt")
8787
IF(32BIT)
8888
SET(COMMON_C_FLAGS "${COMMON_C_FLAGS} -xarch=sparc")

configure.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
153153
GET_FILENAME_COMPONENT(CXX_REALPATH ${CMAKE_CXX_COMPILER} REALPATH)
154154

155155
# CC -V yields
156+
# CC: Studio 12.5 Sun C++ 5.14 SunOS_sparc Dodona 2016/04/04
156157
# CC: Sun C++ 5.13 SunOS_sparc Beta 2014/03/11
157158
# CC: Sun C++ 5.11 SunOS_sparc 2010/08/13
158159

@@ -167,9 +168,13 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
167168
ENDIF()
168169

169170
STRING(REGEX MATCH "CC: Sun C\\+\\+ 5\\.([0-9]+)" VERSION_STRING ${stderr})
171+
IF (CMAKE_MATCH_1 STREQUAL "")
172+
STRING(REGEX MATCH "CC: Studio 12\\.5 Sun C\\+\\+ 5\\.([0-9]+)"
173+
VERSION_STRING ${stderr})
174+
ENDIF()
170175
SET(CC_MINOR_VERSION ${CMAKE_MATCH_1})
171176

172-
IF(${CC_MINOR_VERSION} EQUAL 13)
177+
IF(${CC_MINOR_VERSION} GREATER 12)
173178
SET(STLPORT_SUFFIX "lib/compilers/stlport4")
174179
IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
175180
SET(STLPORT_SUFFIX "lib/compilers/stlport4/sparcv9")

0 commit comments

Comments
 (0)