diff options
| -rw-r--r-- | Makefile.top | 7 | ||||
| -rw-r--r-- | nss/makefile.mk | 26 |
2 files changed, 31 insertions, 2 deletions
diff --git a/Makefile.top b/Makefile.top index 2b0cac09df04..0e85de6c87e5 100644 --- a/Makefile.top +++ b/Makefile.top @@ -435,7 +435,12 @@ build-nocheck : build cross-toolset: bootstrap fetch cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) - +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifneq (WNT,$(OS)) +# We need to build nss for nsinstall... See NSINSTALL=... in nss/makefile.mk + $(GNUMAKE) gb_Side=build nss +endif +endif # # Install diff --git a/nss/makefile.mk b/nss/makefile.mk index bff00b280947..7e27b93a75ab 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -74,7 +74,13 @@ my_prefix=/@.__________________________________________________$(EXTRPATH) my_prefix=$(OUTDIR) .END -CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$(OUTDIR)/inc/mozilla/nspr ; \ +CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$(OUTDIR)/inc/mozilla/nspr + +.IF "$(CROSS_COMPILING)"=="YES" +CONFIGURE_ACTION+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + +CONFIGURE_ACTION+= ; \ sed -e 's\#@prefix@\#$(OUTDIR)\#' -e 's\#@includedir@\#$(OUTDIR)/inc/mozilla/nss\#' -e 's\#@MOD_MAJOR_VERSION@\#$(VER_MAJOR)\#' -e 's\#@MOD_MINOR_VERSION@\#$(VER_MINOR)\#' -e 's\#@MOD_PATCH_VERSION@\#$(VER_PATCH)\#' mozilla/security/nss/nss-config.in > mozilla/security/nss/nss-config ; \ chmod a+x mozilla/security/nss/nss-config @@ -114,6 +120,24 @@ OUT2BIN=config/nspr-config mozilla/security/nss/nss-config BUILD_DIR=mozilla/security/nss BUILD_ACTION= $(GNUMAKE) nss_build_all -j1 + +.IF "$(CROSS_COMPILING)"=="YES" + +.IF "$(OS)-$(CPUNAME)"="MACOSX-POWERPC" +# Hardcode this for now... need to add more when/if cross-compiling to +# other desktop OSes, yeah, this is silly, but the nss build mechanism +# is a bit messy, I could not figure out how to get it to get CPU_ARCH +# automatically when cross-compiling +BUILD_ACTION+= CPU_ARCH=ppc +.ENDIF + +# When cross-compiling need to use a nsinstall built for the build +# platform, so yeah, whole nss built for the build platform just for +# that... But oh well, nss is small compared to LO;) +BUILD_ACTION+= NSINSTALL=$(SRC_ROOT)/nss/$(INPATH_FOR_BUILD)/misc/build/$(TARFILE_ROOTDIR)/mozilla/security/coreconf/nsinstall/out/nsinstall + +.ENDIF + #Note: with the new version the libfreebl3.so gets built in a way that does # not conflict with the system one on Linux automatically; # it is no longer necessary to add a workaround for #i105566# && moz#513024# |