diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-10 18:44:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-10-10 18:44:02 +0000 |
| commit | 788f5c058a3dabd499bea806ce9786aa3a7aaa21 (patch) | |
| tree | 8196e376b13c57b63071dc9048c065c146872729 | |
| parent | e3ced699e0c8d3edb9883197186339b9117af59a (diff) | |
| download | ATCD-788f5c058a3dabd499bea806ce9786aa3a7aaa21.tar.gz | |
Sat Oct 10 18:43:41 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
Reverted the patch below, it breaks g++ on windows
Mon Sep 14 08:54:18 UTC 2009 Olli Savia <ops@iki.fi>
* include/makeinclude/platform_g++_common.GNU:
Make sure $PATH is exported properly.
| -rw-r--r-- | ACE/ChangeLog | 10 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 89e74ef0aa9..66e6bec8cca 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,4 +1,12 @@ -Sat Oct 10 18:21:41 UTC 2009 Olli Savia <ops@iki.fi> +Sat Oct 10 18:43:41 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + Reverted the patch below, it breaks g++ on windows + + Mon Sep 14 08:54:18 UTC 2009 Olli Savia <ops@iki.fi> + * include/makeinclude/platform_g++_common.GNU: + Make sure $PATH is exported properly. + +Sat Oct 10 18:21:41 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-vxworks.h: * ace/config-vxworks6.8.h: diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index e76b8284560..6ddf34fecfa 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -10,11 +10,11 @@ else CXX_FOR_VERSION_TEST ?= $(CXX) endif -CXX_VERSION = $(shell PATH=$(PATH) $(CXX_FOR_VERSION_TEST) -dumpversion) +CXX_VERSION = $(shell $(CXX_FOR_VERSION_TEST) -dumpversion) ifeq (cmd,$(findstring cmd,$(SHELL))) -CXX_MAJOR_VERSION := $(shell PATH=$(PATH) $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e "s/[^0-9\.]//g" | sed -e "s/\..*$$//") +CXX_MAJOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e "s/[^0-9\.]//g" | sed -e "s/\..*$$//") else -CXX_MAJOR_VERSION := $(shell PATH=$(PATH) $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') +CXX_MAJOR_VERSION := $(shell $(CXX_FOR_VERSION_TEST) -dumpversion | sed -e 's/[^0-9\.]//g' | sed -e 's/\..*$$//') endif ifeq ($(findstring $(CXX_MAJOR_VERSION),1 2 3),$(CXX_MAJOR_VERSION)) GXX_4_OR_BETTER := 0 |