diff options
| -rw-r--r-- | nss/ExternalProject_nss.mk | 2 | ||||
| -rw-r--r-- | nss/nss.patch | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index 8a1d489addbb..f907154fb493 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -71,7 +71,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter YES,$(CROSS_COMPILING)),\ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/nss/nsinstall.py") \ NSDISTMODE=copy \ - $(MAKE) -j1 nss_build_all \ + $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) nss_build_all \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libfreebl3.dylib \ diff --git a/nss/nss.patch b/nss/nss.patch index aa714a4142b3..e2d7d7653308 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -138,6 +138,25 @@ # # Define USE_DEBUG_RTL if you want to use the debug runtime library # (RTL) in the debug build +--- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk ++++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk +@@ -293,7 +293,7 @@ + ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) + $(AR) $(subst /,\\,$(OBJS)) + else +- $(AR) $(OBJS) ++ $(AR) cr $@ $(OBJS) + endif + $(RANLIB) $@ + +--- misc/nss-3.13.5/mozilla/security/nss/Makefile ++++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile +@@ 1,0 +1,0 @@ ++export AR ++export RANLIB + #! gmake + # + # ***** BEGIN LICENSE BLOCK ***** --- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 +++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 @@ -41,27 +41,32 @@ |