diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-15 09:12:20 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2010-07-15 09:12:20 +0000 |
| commit | 68930d4468339cadfe839dcb573a79576f22313b (patch) | |
| tree | 9b8bb08812df1ec5ce4d20318cbeac800f8a42f4 /ACE/include/makeinclude/platform_macosx_common.GNU | |
| parent | 5cbc21cbea68766388b2704c9b3b1d15d455a14d (diff) | |
| download | ATCD-68930d4468339cadfe839dcb573a79576f22313b.tar.gz | |
Thu Jul 15 09:11:51 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* ace/config-macosx-snowleopard.h:
* include/makeinclude/platform_clang_common.GNU:
* include/makeinclude/platform_macosx_common.GNU:
Preliminary support for clang compiler.
Diffstat (limited to 'ACE/include/makeinclude/platform_macosx_common.GNU')
| -rw-r--r-- | ACE/include/makeinclude/platform_macosx_common.GNU | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 5ee78669b6a..26a0d565d66 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -29,8 +29,8 @@ pipes ?= 1 CFLAGS += $(FLAGS_C_CC) -CC = gcc -CXX = g++ +CC ?= gcc +CXX ?= g++ CFLAGS += -Wall -Wpointer-arith DCFLAGS += -g @@ -46,8 +46,11 @@ SOBUILD = -o $(VSHDIR)$*.dylib $< # Test for template instantiation, add to SOFLAGS if versioned_so set, # add -E to LDFLAGS if using GNU ld -# -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU +ifeq ($(findstring g++,$(CXX)),)# + include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU +else + include $(ACE_ROOT)/include/makeinclude/platform_clang_common.GNU +endif LDFLAGS += -flat_namespace CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) |