diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:49:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:49:20 +0000 |
| commit | 4f618f4477a49f4246a01098eee3d929f2970a38 (patch) | |
| tree | fd1bf1bd8da1b4009ebdf7fb3ac1e46d6cd23c4f /redland | |
| parent | a6a6b401c453bd25c7de9a9cbe81dd0e8ce943bc (diff) | |
INTEGRATION: CWS sb91 (1.4.4); FILE MERGED
2008/07/21 10:57:37 sb 1.4.4.2: RESYNC: (1.4-1.7); FILE MERGED
2008/07/11 08:43:09 sb 1.4.4.1: #i91567# adapt to unxsolu4
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/redland/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 59758fd2d936..7dd2ae30e12b 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # # 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) |