diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:52:16 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 20:52:16 +0000 |
| commit | d358a1a0b1b512a996238f6359c80d9084396ad1 (patch) | |
| tree | 4d537359b702e915266da4b89e395b0db29d76b1 /berkeleydb | |
| parent | 3a0754549f9c907fb9c761866dbc292bd62cf7c7 (diff) | |
INTEGRATION: CWS ause058 (1.31.8); FILE MERGED
2006/06/19 14:39:34 hjs 1.31.8.1: #i58351# use .EXPORT instead of shell specific setenv
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 35171c85ff7f..b7b24e13de0a 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.31 $ +# $Revision: 1.32 $ # -# last change: $Author: rt $ $Date: 2006-03-08 14:13:53 $ +# last change: $Author: kz $ $Date: 2006-07-05 21:52:16 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -78,11 +78,13 @@ CXX:=$(COMPATH)$/bin$/CC LDFLAGS:=-R\''$$$$ORIGIN'\' .EXPORT: LDFLAGS .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +# just pass ARCH_FLAGS to native build +CFLAGS:=$(ARCH_FLAGS) +CXXFLAGS:=$(ARCH_FLAGS) +.EXPORT : CFLAGS CXXFLAGS CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION= \ - setenv CFLAGS "$(ARCH_FLAGS)" && \ - setenv CXXFLAGS "$(ARCH_FLAGS)" && \ ..$/dist$/configure CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 .IF "$(SOLAR_JAVA)"!="" |