diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-26 14:32:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-26 14:46:59 +0200 |
| commit | 42b722a83af8e38860a62d1541dca27ba41b5120 (patch) | |
| tree | cf8e4462992171b61a04002c06bdbcfa185a9856 /berkeleydb | |
| parent | 8df68b4e1f0abdff732f4a054b74db60fcf9d1af (diff) | |
Fix berkeleydb mingw cross-build.
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 93234f0dde9a..825795a959bf 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -131,14 +131,13 @@ OUT2INC= \ CONFIGURE_DIR=out #relative to CONFIGURE_DIR # TODO needs clean up -CFLAGS+=-nostdinc db_CC=$(CC) -mthreads db_CXX=$(CXX) -mthreads .IF "$(MINGW_SHARED_GCCLIB)"=="YES" db_CC+=-shared-libgcc db_CXX+=-shared-libgcc .ENDIF -db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin +db_LDFLAGS=-L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" @@ -150,7 +149,7 @@ db_LIBXSO_LIBS=$(db_LIBS) db_LIBXSO_LIBS+=-lgcc_s .ENDIF CONFIGURE_ACTION=..$/dist$/configure -CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" +CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)" BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) |