diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 13:03:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 13:03:09 +0000 |
| commit | a5c9d28db90249be401dd3340690543857a4ac46 (patch) | |
| tree | 41c2633f02d4c39a18911148a569c4c047cfecb9 /moz | |
| parent | cc1e97b2534db316cd06833bc0d93359a1aff1a6 (diff) | |
INTEGRATION: CWS sb91 (1.14.6); FILE MERGED
2008/07/18 08:18:45 sb 1.14.6.2: #i91567# improved previous modification
2008/07/14 13:33:51 sb 1.14.6.1: #i91567# adapt to unxsolu4
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index c9e25f75c500..adc4c91c7df0 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # # This file is part of OpenOffice.org. # @@ -135,10 +135,23 @@ BUILD_ACTION:=make .IF "$(GUI)"=="UNX" .IF "$(COMNAME)"=="sunpro5" CXXFLAGS:=-features=tmplife +.IF "$(CPU)"=="U" +CXXFLAGS+=-m64 +.ENDIF .EXPORT : CXXFLAGS .ENDIF # "$(COMNAME)"=="sunpro5" .ENDIF +.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U" +PKG_CONFIG_PATH=/usr/lib/64/pkgconfig +.EXPORT: PKG_CONFIG_PATH +.ENDIF +.IF "$(COM)"=="C52" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U" +CFLAGS=-m64 +ASFLAGS=-m64 +.EXPORT: CFLAGS ASFLAGS +.ENDIF + MOZDIR=$(MISC)$/build$/mozilla MOZTARGET=$(OS)$(COM)$(CPU) |