diff options
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/makefile.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 61c52961c417..45f1feb22680 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -113,7 +113,7 @@ nss_CXX+=-shared-libgcc nss_LIBS= .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -nss_LIBS+=-lstdc++_s +nss_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF @@ -136,8 +136,6 @@ OUT2LIB= \ MOZ_MSVCVERSION= 9 .EXPORT : MOZ_MSVCVERSION moz_build:=$(shell cygpath -p $(MOZILLABUILD)) -PATH!:=$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH) -.EXPORT : PATH #Using WINNT will cause at least that nspr4.dll, plc4.dll, plds4.dll #become libnspr4.dll, libplc4.dll, libplds4.dll @@ -149,7 +147,7 @@ OS_TARGET=WIN95 #To build nss one has to call "make nss_build_all" in #mozilla/security/nss NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) -BUILD_ACTION= $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ +BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ -c "cd $(NSS_BUILD_DIR) && make nss_build_all" OUT2LIB= \ |