diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 14:49:32 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 14:49:32 +0000 |
| commit | c5c13c0be9673f12ba3c1a50610afbbb32dab94a (patch) | |
| tree | 2b254aa9da5b2e6e3aae96ddcb8e98c633da9dbe /berkeleydb | |
| parent | 43856e18c9f44bcf47f8e57a8abaae0e115f0fe8 (diff) | |
CWS-TOOLING: integrate CWS cloph13
2009-09-01 #i104566# also use syslibroot/isysroot for external components
2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS
2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags)
2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility
use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches
ignore "-isysroot /Developer/..." arguments for OOo's cpp
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index fd9f4d7f1b64..5b99d6286fcc 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -40,7 +40,7 @@ TARGET=so_berkeleydb .IF "$(SYSTEM_DB)" == "YES" all: - @echo "An already available installation of db should exist on your system." + @echo "An already available installation of db should exist on your system." @echo "Therefore the version provided here does not need to be built in addition." .ENDIF @@ -102,7 +102,9 @@ CONFIGURE_DIR=out CONFIGURE_ACTION= \ ..$/dist$/configure CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 - +.IF "$(OS)"=="MACOSX" +CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" +.ENDIF # just pass ARCH_FLAGS to native build CFLAGS+:=$(ARCH_FLAGS) CXXFLAGS+:=$(ARCH_FLAGS) |