diff options
| author | Steve Huston <shuston@riverace.com> | 2012-08-27 20:51:09 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-08-27 20:51:09 +0000 |
| commit | 1b9affb69c5655043ebb1d6f6f36f9ea83087f8a (patch) | |
| tree | 731dec50fc4165635de8d32c36f1e2ad0461e372 | |
| parent | a1b3dc88ad774d4148d43b6663f76c37b1a3e006 (diff) | |
| download | ATCD-1b9affb69c5655043ebb1d6f6f36f9ea83087f8a.tar.gz | |
ChangeLogTag:Mon Aug 27 20:38:00 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_linux.GNU | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 0d3cc686265..cc758ab9516 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Mon Aug 27 20:38:00 UTC 2012 Steve Huston <shuston@riverace.com> + + * include/makeinclude/platform_linux.GNU: Make CC and CXX setting + conditional again. Conditional behavior is relied upon by users. + Reverts the following: + Tue Mar 1 11:31:55 UTC 2011 Olli Savia <ops@iki.fi> + Mon Aug 27 09:43:43 UTC 2012 johnny <jwillemsen@remedy.nl> * apps/JAWS/clients/WebSTONE/src/config.cache: diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU index 7d7091920d2..d2c946cf40c 100644 --- a/ACE/include/makeinclude/platform_linux.GNU +++ b/ACE/include/makeinclude/platform_linux.GNU @@ -4,8 +4,8 @@ include $(ACE_ROOT)/include/makeinclude/platform_linux_common.GNU ifeq ($(insure),0) - CC = gcc - CXX = g++ + CC ?= gcc + CXX ?= g++ CXX_FOR_VERSION_TEST ?= $(CXX) else CXX_FOR_VERSION_TEST ?= g++ |