diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-11 17:33:15 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-11 17:33:15 +0000 |
| commit | e5c1aa90385cf4b81b626f6d4333a0976a07e8ff (patch) | |
| tree | cee096acfef7a37f5e35a36b0ea9ff5801ad5936 | |
| parent | bbea1421e4cfe23bd4fd6c2930cf769ac81790d0 (diff) | |
| download | ATCD-e5c1aa90385cf4b81b626f6d4333a0976a07e8ff.tar.gz | |
ChangeLogTag:Mon Apr 11 10:27:12 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | include/makeinclude/platform_g++_common.GNU | 9 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux.GNU | 4 |
3 files changed, 26 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index a1f13a23b0e..39f55ec5432 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Mon Apr 11 10:27:12 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * include/makeinclude/platform_g++_common.GNU: + + Fixed ambiguities when determining whether g++ 4.0 or better is + being used. + + * include/makeinclude/platform_linux.GNU (CXX): + + Do not set CXX variable to "g++" if it has been previously set. + Addresses problem where g++ version was not retrieved from the + g++ compiler set by the user. + Mon Apr 11 15:56:55 2005 Boris Kolpackov <boris@kolpackov.net> * protocols/ace/RMCast/Protocol.h: @@ -12,7 +25,8 @@ Mon Apr 11 12:58:12 UTC 2005 Martin Corino <mcorino@remedy.nl> * bin/PerlACE/ProcessVX.pm: * bin/PerlACE/ProcessVX_Win32.pm: - New Process class with support for running VxWorks tests on remote targets. + New Process class with support for running VxWorks tests on + remote targets. * tests/run_test.pl: Changed to utilize the new ProcessVX class. @@ -21,13 +35,14 @@ Mon Apr 11 11:38:12 UTC 2005 Martin Corino <mcorino@remedy.nl> * ace/OS_NS_Thread.cpp: Added new "C" function 'vx_execae' for VxWorks builds. - Used to run VxWorks tasks (tests) in a more controlled, synchronous way. + Used to run VxWorks tasks (tests) in a more controlled, + synchronous way. Mon Apr 11 11:27:12 UTC 2005 Martin Corino <mcorino@remedy.nl> * ace/config-g++-common.h: - Defined ACE_LACKS_MEMBER_TEMPLATES for GCC < 3.0 as a solution for recent - template compile errors from TypeCode refactoring. + Defined ACE_LACKS_MEMBER_TEMPLATES for GCC < 3.0 as a solution + for recent template compile errors from TypeCode refactoring. Mon Apr 11 11:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU index ba8badeed0c..675c6bab2d5 100644 --- a/include/makeinclude/platform_g++_common.GNU +++ b/include/makeinclude/platform_g++_common.GNU @@ -11,12 +11,13 @@ else endif CXX_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) +GXX_4_OR_BETTER := $(shell major_version=`echo $(CXX_VERSION) | sed -e 's/\..*$$//'`; if test "$$major_version" -gt 3; then echo 1; else echo 0; fi) # If no option has been specified, try to enable templates based on the # version of the compiler. # ifndef templates - ifeq (4.,$(findstring 4.,$(CXX_VERSION))) + ifeq ($(GXX_4_OR_BETTER),1) templates=automatic else ifeq (2.95,$(findstring 2.95,$(CXX_VERSION))) @@ -118,6 +119,6 @@ endif # shared_libs # Take advantage of G++ (>= 4.x) visibility attributes to generate # improved shared library binaries. -ifeq (4.,$(findstring 4.,$(CXX_VERSION))) -CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -endif # $(CXX_VERSION) == 4.x +ifeq ($(GXX_4_OR_BETTER), 1) + CCFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden +endif # GXX_4_OR_BETTER == 1 diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 71ef0089b3a..0f812aa852b 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -80,8 +80,8 @@ ifeq ($(insure),1) CC = insure CXX = insure else - CC = gcc - CXX = g++ + CC ?= gcc + CXX ?= g++ endif # fix this |