[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/settings.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e5ad31e2f784856506c28092166dc8704c84e868
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 20 23:40:36 2014 +0100

    Fix Mac OS X 64 bit SDK settings.mk
    
    ...to simply use Xcode clang++ (which implicitly uses libc++).
    
    Change-Id: I02578f971e4abddfe74211046674bdcd23d7b279

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 9bc42f5..1153746 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -371,22 +371,30 @@ ifeq "$(PROCTYPE)" "x86"
 UNOPKG_PLATFORM=MacOSX_x86
 else
 ifeq "$(PROCTYPE)" "x86_64"
-UNOPKG_PLATFORM=MacOSX_x86
+UNOPKG_PLATFORM=MacOSX_x86_64
 endif
 endif
 JAVABIN=Commands
 
+ifeq "$(PROCTYPE)" "x86"
 GCC_VERSION =$(shell gcc -dumpversion| cut -d"." -f1,2)
 ifeq "$(GCC_VERSION)" "4.2"
 GCC_ARCH_OPTION=-arch i386
 endif
+endif
 
 OS=MACOSX
 PS=/
 ICL=\$$
+ifeq "$(PROCTYPE)" "x86"
 CC=gcc-$(GCC_VERSION)
 LINK=g++-$(GCC_VERSION)
 LIB=g++-$(GCC_VERSION)
+else
+CC=clang++
+LINK=clang++
+LIB=clang++
+endif
 ECHO=@echo
 MKDIR=mkdir -p
 CAT=cat