diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-12-23 11:59:57 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-12-23 11:59:57 +0000 |
commit | 0995047780c53b537fdef7afe3f79d830da2bb14 (patch) | |
tree | fcabdabc390acd9eb6ca9b939dbbfa0fb7569341 /berkeleydb | |
parent | d23e3b8741ecf9bf1607ff60e0480521999cd1dc (diff) |
#i10000# fix build breaks on solaris
Diffstat (limited to 'berkeleydb')
-rw-r--r-- | berkeleydb/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 10c54c4d767f..2ef53f479c30 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.26 $ +# $Revision: 1.27 $ # -# last change: $Author: rt $ $Date: 2005-12-22 16:35:57 $ +# last change: $Author: kz $ $Date: 2005-12-23 12:59:57 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,11 @@ PATCH_FILE_NAME=db-4.2.52.patch LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" -#LDFLAGS:=-R'$$$$ORIGIN' +.IF "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" +CC:=$(COMPATH)$/bin$/cc +CXX:=$(COMPATH)$/bin$/CC +.ENDIF # "$(BUILD_TOOLS)$/cc"=="$(shell +-which cc)" +LDFLAGS:=-R\''$$$$ORIGIN'\' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" .EXPORT: LDFLAGS CONFIGURE_DIR=out |