diff options
| author | Herbert Dürr <hdu@apache.org> | 2013-12-10 18:40:19 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2013-12-10 18:40:19 +0000 |
| commit | 9ce94a804b97cddfbe596f5b7b8973f4ecc5fc86 (patch) | |
| tree | 0c58c0bc53d0c71c95cf86331b6002cf00e14381 /desktop | |
| parent | 382814ccb30bfe71f093e55e23802447caca235d (diff) | |
#122195# change cppu env, comid from generic cxx to s5abi (System 5 AMD64 ABI)
Patch by: Juergen Schmidt <jsc@apache.org>
Merged from r1534063 in the rejuvenate01 branch
Notes
Notes:
prefer: d83de4b1a93ba7ed7bc3243073be3de96a44bfa9
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_platform.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index ef5a5c2c65b5..ea07d4193a72 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -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))) |