diff options
Diffstat (limited to 'berkeleydb/makefile.mk')
| -rw-r--r-- | berkeleydb/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 4cba974cecc2..84d7e0b231eb 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -78,7 +78,7 @@ CXXFLAGS:=-fno-strict-aliasing $(EXTRA_CFLAGS) .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' .EXPORT: LDFLAGS #The current dir when linking is unxlngi6.pro/misc/build/db-4.2.52.NC/out # the map file is in unxlngi6.pro/misc/build/db-4.2.52.NC @@ -105,7 +105,7 @@ CXXFLAGS+:=$(ARCH_FLAGS) BUILD_DIR=$(CONFIGURE_DIR) BUILD_DIR_OUT=$(CONFIGURE_DIR) -BUILD_ACTION=make +BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS) OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2INC= \ @@ -133,7 +133,7 @@ db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR) db_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" CFLAGS+=-D_GLIBCXX_DLL -db_LIBS+=-lstdc++_s +db_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF db_LIBXSO_LIBS=$(db_LIBS) .IF "$(MINGW_SHARED_GCCLIB)"=="YES" |