diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-01-13 16:41:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-01-13 16:41:30 +0000 |
| commit | 99f0e716461dc16416e289a7b9049dccc932dec7 (patch) | |
| tree | a494b1ae1d9ce3afb61f8a09b65856bc6bc5013c | |
| parent | 354f958f96298522bd8d82e96cf8cb964c9acc0e (diff) | |
| download | ATCD-99f0e716461dc16416e289a7b9049dccc932dec7.tar.gz | |
Sun Jan 13 16:40:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 4 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_sunos5_sunc++.GNU | 8 |
3 files changed, 13 insertions, 10 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c517579eec1..dd1e421c208 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,10 +1,19 @@ +Sun Jan 13 16:40:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_sunos5_sunc++.GNU: + Set PLATFORM_STLPORT_CPPFLAGS independent of the Sun C++ version. + Thanks to Charles Brown <charles dot brown at sensis dot com> + for reporting that this was causing a problem with Studio 12 + + * include/makeinclude/platform_g++_common.GNU: + Only set CXX_VERSION_FOR_TEST when it has not been set yet + Fri Jan 11 09:01:12 UTC 2008 Martin Corino <mcorino@remedy.nl> * bin/PerlACE/ProcessVX_Win32.pm: Added ACE_RUN_VX_PRJ_ROOT env.var. to allow for projects having root directory for tests different from ACE_ROOT. - Tue Jan 8 09:02:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/os_include/sys/os_types.h: diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index 90089bfc1dc..36d2ee245a5 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -5,9 +5,9 @@ ifeq ($(CXX),insure) # insure does not pass through the -dumpversion option. - CXX_FOR_VERSION_TEST = g++ + CXX_FOR_VERSION_TEST ?= g++ else - CXX_FOR_VERSION_TEST = $(CXX) + CXX_FOR_VERSION_TEST ?= $(CXX) endif CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU index 76485a86a89..8f7df58072b 100644 --- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU @@ -71,13 +71,7 @@ ifeq (C++ 5.4,$(findstring C++ 5.4,$(CC_VERSION))) ACE_CC_PREPROCESSOR = cc endif -ifeq (C++ 5.6,$(findstring C++ 5.6,$(CC_VERSION))) - PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 -else - ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 - endif -endif +PLATFORM_STLPORT_CPPFLAGS = -library=stlport4 ifeq ($(atomic_ops_sparc),1) CFLAGS += -DACE_HAS_BUILTIN_ATOMIC_OP -DACE_INCLUDE_ATOMIC_OP_SPARC |