diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:28:43 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:28:43 +0000 |
| commit | 67fdc06273c2a423e32d6e78f9ae046a7ef3a9db (patch) | |
| tree | 29b2d07fdb87b65acb4641bc851564a8dd263ea2 /lib/Makefile | |
| parent | e41bdc85df87fec3dbdce52568d217ae0d58127c (diff) | |
| download | nss-hg-67fdc06273c2a423e32d6e78f9ae046a7ef3a9db.tar.gz | |
Bug 290526 Parallelize part of the NSS build r=rrelyea
This still serializes many targets, but at least these targets
themself run their build in parallel. The main serialization
happens in nss/Makefile and nss/coreconf/rules.mk's all target.
We can't add these as real dependencies, as all Makefile snippets
use the same variable names. I tried to always run sub-makes to
hack in the depndencies, but these don't know of each other, so
targets very often run twice, and this breaks the build.
Having a tests:: target and a tests directory leads to misery (and
doesn't work), so it's renamed to check.
This just works with NSS_DISABLE_GTESTS=1 specified and is fixed
by a follow up patch, which removes the double-colon usage and
adds the directory dependencies!
Differential Revision: https://phabricator.services.mozilla.com/D69019
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/Makefile b/lib/Makefile index 8eedad0b2..337b32860 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -54,22 +54,6 @@ ifndef NSS_DISABLE_LIBPKIX LIBPKIX_SRCDIR = libpkix # Add the libpkix directory to DIRS. endif -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - ifeq ($(NSS_BUILD_UTIL_ONLY),1) UTIL_SRCDIR = util FREEBL_SRCDIR = @@ -95,3 +79,19 @@ else endif endif endif + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORE_DEPTH)/coreconf/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### |