diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-16 12:45:46 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-06-16 12:45:46 +0000 |
commit | 79e12bf2448e387f6f955297cc8508b9f5249a72 (patch) | |
tree | 5a3823793fd89263dddae8cc942696e47840a8ec /berkeleydb | |
parent | 884f487cada84acd737e259c5aca0db9853cef80 (diff) |
INTEGRATION: CWS hr51 (1.47.4); FILE MERGED
2008/06/06 13:58:46 hr 1.47.4.1: #i88947#: Solaris 64 bit support
Diffstat (limited to 'berkeleydb')
-rw-r--r-- | berkeleydb/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index a23aa5bf88e9..b013d9c8d8ea 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.47 $ +# $Revision: 1.48 $ # # This file is part of OpenOffice.org. # @@ -92,7 +92,7 @@ LDFLAGSVERSION:= -Wl,--version-script=../db_4_2_gcc3.map #CC:=$(COMPATH)$/bin$/cc #CXX:=$(COMPATH)$/bin$/CC #.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" -LDFLAGS:=-R\''$$$$ORIGIN'\' +LDFLAGS:=$(ARCH_FLAGS) -R\''$$$$ORIGIN'\' .EXPORT: LDFLAGS .ENDIF # "$(OS)$(COM)"=="SOLARISC52" CONFIGURE_DIR=out |