diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-13 19:00:40 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-13 19:00:40 +0000 |
| commit | 871c2ef40cad876c481d19cf12ad3c852a9c20a2 (patch) | |
| tree | 77511f45b0eede6a34c1db06f0dc5f2bb514552c /manifest.mn | |
| parent | b64d495f1531254dd64d16686f9f87444a53348f (diff) | |
| download | nss-hg-871c2ef40cad876c481d19cf12ad3c852a9c20a2.tar.gz | |
Bug 1637083 Replace pre-dependency with shell hack r=rrelyea
Originally I tried multiple variants using make's conditionals
to limit DIRS and enforce building the parent directory before
the sub-directory. None of them worked for me, most resulting in
an infinite recursion, so I used the current pre-depends
workaround to fulfill the real dependency.
Now I remembered that automake can handle this case for SUBDIRS
specifying "." as a directory. The generated Makefile handles it
via shell scripting; not nice, but it works.
So this gets rid of the workaround, replacing it with a small
shell test.
Differential Revision: https://phabricator.services.mozilla.com/D74855
Diffstat (limited to 'manifest.mn')
| -rw-r--r-- | manifest.mn | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/manifest.mn b/manifest.mn index 4cd1ea5ee..dada8abab 100644 --- a/manifest.mn +++ b/manifest.mn @@ -23,12 +23,6 @@ prepare_build: # no real way to encode these in any sensible way $(MAKE) -C coreconf/nsinstall program $(MAKE) export - # pre-build child dir -> parent dir dependencies - # ckfw/builtins -> ckfw - IGNORE_DIRS=1 $(MAKE) -C lib/ckfw libs - # ckfw/builtins/testlib -> ckfw/builtins + base - $(MAKE) -C lib/base libs - IGNORE_DIRS=1 $(MAKE) -C lib/ckfw/builtins libs all: prepare_build $(MAKE) libs |