From d90fa3890d18ca554ec48cb78fcc7bf410dabb85 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 13 Sep 2013 19:14:41 +0200 Subject: nss: nmedit is apparently also affected by xcrun... ...but it's the only use of that tool apparently (hoping that libtool merely checks for it for decorative purposes) so perhaps we can do without another config_host.mk variable... Change-Id: I2a0dec4c01dc8ad3327b34a99c807705fedcdd00 --- nss/ExternalProject_nss.mk | 2 +- nss/nss_macosx.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'nss') diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index f907154fb493..843a1534ba13 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 AR=$(AR) RANLIB=$(RANLIB) nss_build_all \ + $(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit 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_macosx.patch b/nss/nss_macosx.patch index 6b5096072f5c..102e9a322fdc 100644 --- a/nss/nss_macosx.patch +++ b/nss/nss_macosx.patch @@ -65,3 +65,14 @@ MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) DLL_SUFFIX = dylib +--- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk ++++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk +@@ -342,7 +342,7 @@ + chmod +x $@ + ifeq ($(OS_TARGET),Darwin) + ifdef MAPFILE +- nmedit -s $(MAPFILE) $@ ++ $(NMEDIT) -s $(MAPFILE) $@ + endif + endif + endif -- cgit