diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-02-19 20:45:32 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-02-19 20:45:32 +0800 |
| commit | 18f723faa85b78dff7c8f59257640feededc44d1 (patch) | |
| tree | 15e4a6cf2ae285343b6828b3d50f6f262ae0df2d /java | |
| parent | c09dca3fb0369a92a7cfb2a5ec3102a6315b8cc2 (diff) | |
Fix parallel compilation of Android port
* cross/Makefile.in ($(top_builddir)/lib/libgnu.a):
* java/Makefile.in (CROSS_LIBS): Explicitly depend on gnulib
to prevent it from being built at the same time from different
jobs.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.in | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/java/Makefile.in b/java/Makefile.in index f732c9211ee..91feb53e96b 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -121,17 +121,25 @@ CROSS_BINS = ../cross/src/android-emacs ../cross/lib-src/ctags \ # Libraries to cross-compile. CROSS_LIBS = ../cross/src/libemacs.so +# Make sure gnulib is built first! +# If not, then the recursive invocations of make below will try to +# build gnulib at the same time. +CROSS_ARCHIVES = ../cross/lib/libgnu.a + # Third party libraries to compile. include $(top_builddir)/cross/ndk-build/ndk-build.mk -.PHONY: $(CROSS_BINS) $(CROSS_LIBS) +.PHONY: $(CROSS_BINS) $(CROSS_LIBS) $(CROSS_ARCHIVES) -../cross/src/android-emacs ../cross/src/libemacs.so: - make -C ../cross src/$(notdir $@) +../cross/src/android-emacs ../cross/src/libemacs.so: $(CROSS_ARCHIVES) + $(MAKE) -C ../cross src/$(notdir $@) ../cross/lib-src/hexl ../cross/lib-src/movemail \ -../cross/lib-src/ctags ../cross/lib-src/ebrowse &: - make -C ../cross lib-src/$(notdir $@) +../cross/lib-src/ctags ../cross/lib-src/ebrowse &: $(CROSS_ARCHIVES) + $(MAKE) -C ../cross lib-src/$(notdir $@) + +../cross/lib/libgnu.a: + $(MAKE) -C ../cross lib/libgnu.a # This is needed to generate the ``.directory-tree'' file used by the # Android emulations of readdir and faccessat. |