Modified: openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx?rev=1549925&r1=1549924&r2=1549925&view=diff ============================================================================== --- openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx (original) +++ openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx Tue Dec 10 18:40:19 2013 @@ -59,6 +59,7 @@ #define PLATFORM_FREEBSD_X86 "freebsd_x86" #define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64" #define PLATFORM_MACOSX_X86 "macosx_x86" +#define PLATFORM_MACOSX_X86_64 "macosx_x86_64" #define PLATFORM_MACOSX_PPC "macosx_powerpc" #define PLATFORM_OS2_X86 "os2_x86" @@ -169,6 +170,8 @@ namespace ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64")); else if (token.equals(OUSTR(PLATFORM_MACOSX_X86))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86")); + else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64))) + ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64")); else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC))) ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC")); else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1549925&r1=1549924&r2=1549925&view=diff ============================================================================== --- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original) +++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Tue Dec 10 18:40:19 2013 @@ -23,6 +23,8 @@ GUI := UNX COM := GCC +#COM := S5ABI +#COMID := s5abi # Darwin mktemp -t expects a prefix, not a pattern gb_MKTEMP ?= /usr/bin/mktemp -t gbuild. Modified: openoffice/trunk/main/solenv/inc/tg_compv.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_compv.mk?rev=1549925&r1=1549924&r2=1549925&view=diff ============================================================================== --- openoffice/trunk/main/solenv/inc/tg_compv.mk (original) +++ openoffice/trunk/main/solenv/inc/tg_compv.mk Tue Dec 10 18:40:19 2013 @@ -129,6 +129,11 @@ COMID=C730 COMNAME=MipsPro .ENDIF +.IF "$(COM)"=="CLANG" +COMID=s5abi +COMNAME=s5abi +.ENDIF + .IF "$(COMNAME)"=="" # "EXCEPTIONSFILES" get compiled before this, but shouldn't Propchange: openoffice/trunk/test/ ------------------------------------------------------------------------------ Merged /openoffice/branches/rejuvenate01/test:r1534063 Propchange: openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl/ ------------------------------------------------------------------------------ Merged /openoffice/branches/rejuvenate01/test/testcommon/source/org/openoffice/test/vcl:r1534063
