diff options
| author | wtc%google.com <devnull@localhost> | 2010-10-13 00:52:53 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2010-10-13 00:52:53 +0000 |
| commit | de0a5e4cd1e7b7f692a7dadafe92819be548db24 (patch) | |
| tree | 2e9c551502877eef8fbfd8c2899e7e324f618e22 | |
| parent | 19dfb7af18535f0b1402c98ba74e5f7c8e9a1f17 (diff) | |
| download | nspr-hg-de0a5e4cd1e7b7f692a7dadafe92819be548db24.tar.gz | |
Bug 603214: Build NSPR in parallel. The patch is contributed by Kyle HueyNSPR_HEAD_20101013
<khuey@kylehuey.com>. r=wtc.
Modified Files:
Makefile.in pr/src/Makefile.in
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | pr/src/Makefile.in | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index c80d24a8..b556be71 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,8 +45,6 @@ VPATH = @srcdir@ include $(MOD_DEPTH)/config/autoconf.mk -MAKE := $(patsubst -j%,,$(MAKE)) -j1 - DIRS = config pr lib ifdef MOZILLA_CLIENT diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 35fa7fb2..358b1687 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -380,12 +380,19 @@ endif # +# We use a 'build' target here to ensure that we build $(TARGETS) after +# looping over $(DIRS) to create the object files in a parallel build. +# Recipe commands are executed sequentially in a parallel build while +# target dependencies are executed in parallel. +export:: + $(MAKE) build + # # The Client build wants the shared libraries in $(dist_bindir) # so we also install them there. # -export:: $(TARGETS) +build:: $(TARGETS) $(INSTALL) -m 444 $(TARGETS) $(dist_libdir) ifdef SHARED_LIBRARY ifeq ($(OS_ARCH),HP-UX) |