diff options
| author | Steve Huston <shuston@riverace.com> | 2013-02-26 23:10:00 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2013-02-26 23:10:00 +0000 |
| commit | 218e6406e279fdb161eac6201ae97db286a68040 (patch) | |
| tree | e272cb551458fd6b4c1818062e44d97080844775 | |
| parent | f74cdd2acd0efe08fc0dd0f9bba9b27c368620b9 (diff) | |
| download | ATCD-218e6406e279fdb161eac6201ae97db286a68040.tar.gz | |
ChangeLogTag:Tue Feb 26 23:07:17 UTC 2013 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_g++_common.GNU | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 968990263b3..152fc43c53b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Feb 26 23:07:17 UTC 2013 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_g++_common.GNU: When turning on + no-strict-aliasing, add the option to FLAGS_C_CC instead of + CCFLAGS so that both C and C++ compilers get it. + Thu Jan 3 22:53:44 UTC 2013 Steve Huston <shuston@riverace.com> * ace/OS_NS_netdb.cpp (ACE_OS::getmacaddress): On Linux, search for diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU index d7e4db7355d..851e1c905c7 100644 --- a/include/makeinclude/platform_g++_common.GNU +++ b/include/makeinclude/platform_g++_common.GNU @@ -143,7 +143,7 @@ ifeq ($(no-optimize-sibling-calls), 1) endif ifeq ($(no_strict_aliasing), 1) - CCFLAGS += -fno-strict-aliasing + FLAGS_C_CC += -fno-strict-aliasing else ifneq ($(no_strict_aliasing), 0) # if not explicitly disabled enable suppression of strict-aliasing checks by default @@ -152,7 +152,7 @@ else # lot of pain to attempt to solve code issues and the best way to deal is to suppress ifeq ($(GXX_4_OR_BETTER), 1) ifneq ($(findstring $(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION),4.1),$(CXX_MAJOR_VERSION).$(CXX_MINOR_VERSION)) - CCFLAGS += -fno-strict-aliasing + FLAGS_C_CC += -fno-strict-aliasing endif endif endif |