diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-10-14 23:35:54 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-10-14 23:49:11 +0300 |
commit | c96b4c550db2e5206786b9b689c2eb293ee787bb (patch) | |
tree | 0361ae4044cb466ddc982fe41e0359c86f538418 /Makefile.top | |
parent | pyfax: get rid of import * (diff) | |
download | core-c96b4c550db2e5206786b9b689c2eb293ee787bb.tar.gz core-c96b4c550db2e5206786b9b689c2eb293ee787bb.zip |
Handle cross-compilation of nss (for desktop OSes)
A bit messy, but then so is the nss configuration and build mechanism.
Change-Id: If2259e3da81521a2f87a5b312c6acd9d40e75ae5
Diffstat (limited to 'Makefile.top')
-rw-r--r-- | Makefile.top | 7 |
1 files changed, 6 insertions, 1 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 |