MAC compilation OK

CMakeLists.txt

@@ -5,16 +5,18 @@ option(CHAOS_ARCHITECTURE_TEST "Architecture tests" ON)
 IF (DEFINED ENV{CHAOS_BUNDLE} )
   include($ENV{CHAOS_BUNDLE}/tools/project_template/CMakeChaos.txt)
 ELSE()
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+
+EXECUTE_PROCESS(COMMAND uname -s OUTPUT_VARIABLE SYSTEM_NAME)
+MESSAGE(STATUS " System : ${SYSTEM_NAME}")
+IF(${SYSTEM_NAME} MATCHES "Darwin")
    # Mac OS X specific code
-   MESSAGE(status "enabling MAC compulation")
+   MESSAGE(STATUS " enabling MAC compilation")
   SET(FrameworkLib boost_program_options boost_date_time boost_system  boost_chrono boost_regex boost_log_setup boost_log boost_filesystem boost_thread boost_atomic zmq jsoncpp pthread dl)
 ELSE()
   SET(FrameworkLib boost_program_options boost_date_time boost_system  boost_chrono boost_regex boost_log_setup boost_log boost_filesystem boost_thread boost_atomic zmq jsoncpp pthread rt dl)
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") 
 
 ENDIF()
-
+ENDIF()
 project (chaos)
 
 SET( ${PROJECT_NAME}_MAJOR_VERSION 0 )
@@ -22,8 +24,8 @@ SET( ${PROJECT_NAME}_MINOR_VERSION 1 )
 SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )
 
 
-add_definitions(-DDEBUG -static-libstdc++)
-
+add_definitions(-DDEBUG )
+SET(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++")
 
 EXECUTE_PROCESS(COMMAND chaos/common/version.sh)
 

bootstrap.sh

@@ -42,9 +42,6 @@ if [ -z "$LIB_EVENT_VERSION" ];then
     LIB_EVENT_VERSION=release-2.1.4-alpha
 fi
 
-if [ -z "$CHAOS_BOOST_VERSION" ];then
-    CHAOS_BOOST_VERSION=55
-fi
 
 #if [ ! -n "$LUA_VERSION" ]; then
 #    LUA_VERSION=5.3.2
@@ -73,6 +70,9 @@ if [ -z "CFLAGS" ];then
     export CFLAGS="-DCHAOS -fPIC"
 fi
 
+if [ -z "$CHAOS_BOOST_VERSION" ];then
+    CHAOS_BOOST_VERSION=55
+fi
 
 #####
 if [ -e $CHAOS_BUNDLE/tools/common_util.sh ];then
@@ -93,7 +93,7 @@ else
     CHAOS_DIR=$CHAOS_BUNDLE
     if [ `echo $OS | tr '[:upper:]' '[:lower:]'` = `echo "Darwin" | tr '[:upper:]' '[:lower:]'` ] && [ $KERNEL_SHORT_VER -ge 1300 ] && [ ! -n "$CROSS_HOST" ]; then
 	echo "Use standard CLIB with clang"
-	
+	CHAOS_BOOST_VERSION=56
 	export CC=clang
 	export CXX="clang++"
 	export CXXFLAGS="-stdlib=libstdc++"
@@ -103,7 +103,7 @@ else
 	APPLE="true"
     ## 18, 16 doesnt compile
 	export LMEM_VERSION=1.0.18
-	export CHAOS_BOOST_FLAGS="$CHAOS_BOOST_FLAGS toolset=clang cxxflags=\"-stdlib=libstdc++ -fPIC\" linkflags=-stdlib=libstdc++ link=static runtime-link=shared variant=release"
+	export CHAOS_BOOST_FLAGS="$CHAOS_BOOST_FLAGS toolset=clang cxxflags=-stdlib=libstdc++ linkflags=-stdlib=libstdc++ link=static runtime-link=shared variant=release"
 
     fi