diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-08-30 15:37:03 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-30 16:10:16 +0200 |
| commit | 291b85778669b4e4e276faab22add9d0e80046df (patch) | |
| tree | 05b81f198bd66bc63c6d9d44cd8389730ae0185e /moz | |
| parent | a44712b810eba7ba3032c9eb15441997b064d846 (diff) | |
Build our mozilla (module moz) against the nss we have built anyway.
Reduces the build time of the 'moz' module by 30% or so.
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/extractfiles.mk | 2 | ||||
| -rw-r--r-- | moz/makefile.mk | 12 | ||||
| -rw-r--r-- | moz/zipped/makefile.mk | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index faba88b7822f..57b53a8af10d 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -166,7 +166,7 @@ DEFAULTS_RUNTIMELIST= \ .IF "$(ENABLE_NSS_MODULE)"=="YES" #These headers come from the separate NSS module if enabled -NSS_INCLUDE_LIST= nspr nss +NSS_INCLUDE_LIST= .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/moz/makefile.mk b/moz/makefile.mk index 0ee92d305044..f41743ec000e 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -128,6 +128,8 @@ MOZILLA_CONFIGURE_FLAGS += --disable-tests \ --disable-xprint \ --disable-postscript \ --without-system-zlib \ + --with-system-nss \ + --with-system-nspr \ --disable-installer \ --disable-accessibility \ --disable-xpfe-components \ @@ -145,6 +147,14 @@ MOZILLA_CONFIGURE_FLAGS += --disable-tests \ --disable-pango \ --enable-extensions="pref" +.IF "$(ENABLE_NSS_MODULE)"=="YES" + +MOZILLA_CONFIGURE_FLAGS += \ + --with-nss-prefix=$(OUTDIR) \ + --with-nspr-prefix=$(OUTDIR) + +.ENDIF + #disable profilelocking to share profile with mozilla #disable activex and activex-scripting to remove the dependence of Microsoft_SDK\src\mfc\atlbase.h #disable gnomevfs to remove the needed of gnome develop files @@ -174,7 +184,7 @@ MOZ_CROSSCOMPILE=CROSS_COMPILE=1 CC="$(CC) -arch $(MOZ_ARCH)" CXX="$(CXX) -arch CONFIGURE_ACTION=$(null,$(MOZ_ARCH) $(NULL) $(MOZ_CROSSCOMPILE)) ../configure $(MOZILLA_CONFIGURE_FLAGS) -BUILD_ACTION:=$(GNUMAKE) -j$(EXTMAXPROCESS) +BUILD_ACTION:=cd mozilla/X_objdir/xpcom ; $(GNUMAKE) -j$(EXTMAXPROCESS) .IF "$(GUI)"=="UNX" .IF "$(COMNAME)"=="sunpro5" diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index 0ea80c02dc3e..36469cbd2887 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -154,7 +154,7 @@ LIBLIST= \ .ENDIF # .IF "$(GUI)"=="WNT" -NSS_INCLUDE_LIST= nspr nss +NSS_INCLUDE_LIST= .IF "$(OS)" == "SOLARIS" |