This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8e4fd71  GEODE-3457: Linking fails on Solaris SPARC due to 
-xatomic=none option
8e4fd71 is described below

commit 8e4fd714f7d317484cacd92f54539eb6655681ad
Author: David Kimura <dkim...@pivotal.io>
AuthorDate: Thu Aug 17 14:11:19 2017 -0700

    GEODE-3457: Linking fails on Solaris SPARC due to -xatomic=none option
---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb40517..abb7a65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -166,7 +166,12 @@ add_library(c++11 INTERFACE)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
   # Force linker to error on undefined symbols in shared libraries
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z defs 
-xatomic=none")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z defs")
+  if (PRODUCT_SYSTEM_NAME STREQUAL "solaris-sparc")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} 
-xatomic=studio")
+  elseif(PRODUCT_SYSTEM_NAME STREQUAL "solaris-x86")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -xatomic=none")
+  endif()
   # TODO cmake find a better way to set runtime libraries
   # C++11 requires these libraries, treat -std=c++11 as library
   #TODO look into CMAKE_CXX_STANDARD_LIBRARIES

-- 
To stop receiving notification emails like this one, please contact
['"dev@geode.apache.org" <dev@geode.apache.org>'].

Reply via email to