diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:11:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:11:43 +0000 |
| commit | 1b39ef73fdeeae4681e7a5f0c65b74770d0951ca (patch) | |
| tree | 35b8357e06fe92ab752d06ae3eb5e3e34cb9f59c /setup_native/scripts/source | |
| parent | 9356bef3b0bc76afb37e5fefe1c05e41718aadcc (diff) | |
INTEGRATION: CWS hr51 (1.10.20); FILE MERGED
2008/06/06 16:23:03 hr 1.10.20.2: RESYNC: (1.10-1.11); FILE MERGED
2008/06/06 14:33:49 hr 1.10.20.1: #i88947#: Solaris 64 bit support
Diffstat (limited to 'setup_native/scripts/source')
| -rw-r--r-- | setup_native/scripts/source/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk index e3d7c6160057..6ff2dfe0afe6 100644 --- a/setup_native/scripts/source/makefile.mk +++ b/setup_native/scripts/source/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # # This file is part of OpenOffice.org. # @@ -65,12 +65,17 @@ CFLAGS+=-D_KERNEL .ENDIF # this object must not be a Ultra SPARC binary, this does not -# work with /usr/bin/sort and such. +# work with /usr/bin/sort and such. Needs to be 32 bit even in +# 64 bit builds .IF "$(OS)" == "SOLARIS" -.IF "$(CPU)" == "S" .IF "$(COM)" != "GCC" +.IF "$(CPU)" == "S" ENVCFLAGS=-xarch=v8 .ENDIF +.IF "$(CPU)"=="U" +CFLAGSAPPEND+=-m32 +LINKFLAGSSHL+=-m32 +.ENDIF .ENDIF .ENDIF |