diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-05-22 10:22:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2014-05-22 10:22:11 +0000 |
| commit | 2a3eb599f6f11105373147c0a4e887bbd5b490fe (patch) | |
| tree | f21f5d750ed9fdabfb804335566a200b99871771 | |
| parent | b1d87f751702fb0d77d5365dddc69b94b29f1d86 (diff) | |
| download | ATCD-2a3eb599f6f11105373147c0a4e887bbd5b490fe.tar.gz | |
Thu May 22 10:21:13 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_g++_common.GNU:
Some make versions don't look to like my nested construct
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_g++_common.GNU | 20 |
2 files changed, 17 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9b9b9721e04..d895d90f97a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu May 22 10:21:13 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_g++_common.GNU: + Some make versions don't look to like my nested construct + Thu May 22 07:51:53 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-g++-common.h: diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index c6c2f68f06a..4cb04298e7c 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -63,14 +63,18 @@ ifeq ($(c++1y),1) CCFLAGS += -std=c++1y # This is needed due to the use of the deprecated auto_ptr class CCFLAGS += -Wno-deprecated -else ifeq ($(c++11),1) - CCFLAGS += -std=c++11 - # This is needed due to the use of the deprecated auto_ptr class - CCFLAGS += -Wno-deprecated -else ifeq ($(c++0x),1) - CCFLAGS += -std=c++0x - # This is needed due to the use of the deprecated auto_ptr class - CCFLAGS += -Wno-deprecated +else + ifeq ($(c++11),1) + CCFLAGS += -std=c++11 + # This is needed due to the use of the deprecated auto_ptr class + CCFLAGS += -Wno-deprecated + else + ifeq ($(c++0x),1) + CCFLAGS += -std=c++0x + # This is needed due to the use of the deprecated auto_ptr class + CCFLAGS += -Wno-deprecated + endif + endif endif ifeq ($(gcov),1) |