diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:48:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:48:54 +0000 |
| commit | bb14408835e53eca5a284e27282897dd4fdb4f9f (patch) | |
| tree | a428618e1850793b79d522e32d000b214bb6261a | |
| parent | ddca3b4bf1e11ae67cc21b6b7df0365f306456e2 (diff) | |
INTEGRATION: CWS sb91 (1.3.4); FILE MERGED
2008/07/21 10:57:23 sb 1.3.4.2: RESYNC: (1.3-1.6); FILE MERGED
2008/07/11 08:43:09 sb 1.3.4.1: #i91567# adapt to unxsolu4
| -rw-r--r-- | redland/raptor/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 90e27606b5b5..6c082f10d246 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -81,6 +81,11 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +.IF "$(COM)"=="C52" && "$(CPU)"=="U" +CFLAGS=-m64 +.EXPORT: CFLAGS +.ENDIF + # NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto CPPFLAGS+:=-I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(SOLARLIBDIR) |