Skip to content

Commit 1064997

Browse files
committed
fix build of slang
- add .NOTPARALLEL target to disable parallel make
1 parent d5ae86d commit 1064997

File tree

2 files changed

+37
-4
lines changed

2 files changed

+37
-4
lines changed

cross/slang/Makefile

-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,4 @@ GNU_CONFIGURE = 1
1515
CONFIGURE_ARGS = --with-z=$(INSTALL_DIR)/$(INSTALL_PREFIX)
1616
CONFIGURE_ARGS += --with-pcre=$(INSTALL_DIR)/$(INSTALL_PREFIX)
1717

18-
# disable parallel make
19-
# https://github.com/osresearch/heads/issues/385#issuecomment-382926111
20-
# https://github.com/osresearch/heads/commit/acf16c7304de8675f66ecc204b2abea25f0f67a3
21-
COMPILE_MAKE_OPTIONS += -j1
2218
include ../../mk/spksrc.cross-cc.mk
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# try to avoid build errors by disabling parallel make
2+
#
3+
--- autoconf/Makefile.in.org 2011-04-11 02:37:07.000000000 +0000
4+
+++ autoconf/Makefile.in 2020-10-06 19:22:35.175361801 +0000
5+
@@ -97,3 +97,5 @@
6+
#
7+
.PHONY: all help static elf install clean check install-elf install-static makefiles install-pkgconfig
8+
#
9+
+.NOTPARALLEL:
10+
+#
11+
12+
--- src/Makefile.in.org 2011-04-11 02:37:07.000000000 +0000
13+
+++ src/Makefile.in 2020-10-06 19:28:52.395123281 +0000
14+
@@ -247,3 +247,5 @@
15+
#---------------------------------------------------------------------------
16+
# Object Rules : These are created from the configure script (hopefully)
17+
#---------------------------------------------------------------------------
18+
+
19+
+.NOTPARALLEL:
20+
21+
--- slsh/Makefile.in.org 2020-10-06 19:40:56.828016639 +0000
22+
+++ slsh/Makefile.in 2020-10-06 19:41:05.660705644 +0000
23+
@@ -163,3 +163,5 @@
24+
install_lib_files install_rline_files install_scripts install_help \
25+
install_docs
26+
27+
+.NOTPARALLEL:
28+
+
29+
30+
--- modules/Makefile.in.org 2011-04-11 02:37:07.000000000 +0000
31+
+++ modules/Makefile.in 2020-10-06 19:28:36.270244972 +0000
32+
@@ -169,3 +169,5 @@
33+
-/bin/rm -f Makefile
34+
35+
.PHONY: $(MODULES) clean distclean all install
36+
+
37+
+.NOTPARALLEL:

0 commit comments

Comments
 (0)