summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/include/makeinclude/platform_macosx_lion.GNU8
2 files changed, 14 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 9138232ee5c..d98f47f7b88 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 29 01:58:23 UTC 2011 Abdullah Sowayan <sowayan@gmail.com>
+
+ * include/makeinclude/platform_macosx_lion.GNU:
+
+ LLVM is the default compiler on Lion for now on.
+
Fri Sep 23 12:45:47 UTC 2011 Marcel Smit <msmit@remedy.nl>
* bin/PerlACE/TestTarget.pm:
diff --git a/ACE/include/makeinclude/platform_macosx_lion.GNU b/ACE/include/makeinclude/platform_macosx_lion.GNU
index cbaab50f2ab..d3caf0d4a09 100644
--- a/ACE/include/makeinclude/platform_macosx_lion.GNU
+++ b/ACE/include/makeinclude/platform_macosx_lion.GNU
@@ -17,6 +17,14 @@ ifeq ($(buildbits),universal)
LDFLAGS += -arch i386 -arch x86_64
endif
+ifneq (,$(buildbits))
+ FLAGS_C_CC += -m64
+ LDFLAGS += -m64
+endif
+
+CC:=clang
+CXX:=clang++
+
PLATFORM_NDDS_FLAGS=-ppPath cpp-4.2 -I.
include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU