summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2012-12-21 07:01:40 (GMT)
committerTony Theodore <tonyt@logyst.com>2012-12-21 07:01:40 (GMT)
commit9dac98aa11a8c12f06b88b1bbed7446523bf8ecb (patch)
treefd7fa341d71eadcfcf4df75cdf1d740a80045d54
parentd83b0f9e19fd955baa44e0f8e0781d84ba52a6c3 (diff)
downloadmxe-9dac98aa11a8c12f06b88b1bbed7446523bf8ecb.zip
mxe-9dac98aa11a8c12f06b88b1bbed7446523bf8ecb.tar.gz
mxe-9dac98aa11a8c12f06b88b1bbed7446523bf8ecb.tar.bz2
package ocaml-core: add explicit -j 1 to prevent random build failures
-rw-r--r--src/ocaml-core.mk22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ocaml-core.mk b/src/ocaml-core.mk
index fa0f5ef..9b87587 100644
--- a/src/ocaml-core.mk
+++ b/src/ocaml-core.mk
@@ -43,7 +43,7 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)' -j 1 coreboot
$(MAKE) -C '$(1)' -j 1 all
# install ocamldoc and camlp4 (non cross versions)
- $(MAKE) -C '$(1)/ocamldoc' install
+ $(MAKE) -C '$(1)/ocamldoc' -j 1 install
cd '$(1)' && BINDIR=$(PREFIX)/$(TARGET)/bin \
LIBDIR=$(PREFIX)/$(TARGET)/lib/ocaml \
PREFIX=$(PREFIX)/$(TARGET) \
@@ -93,23 +93,23 @@ define $(PKG)_BUILD
####### build mingw ocaml
# Just rebuild some small bits that we need for the following
# 'make opt' to work. Note that 'make all' fails here.
- $(MAKE) -C '$(1)/byterun' libcamlrun.a
- $(MAKE) -C '$(1)' ocaml ocamlc
- $(MAKE) -C '$(1)/stdlib'
- $(MAKE) -C '$(1)/tools' ocamlmklib
+ $(MAKE) -C '$(1)/byterun' -j 1 libcamlrun.a
+ $(MAKE) -C '$(1)' -j 1 ocaml ocamlc
+ $(MAKE) -C '$(1)/stdlib' -j 1
+ $(MAKE) -C '$(1)/tools' -j 1 ocamlmklib
# Build ocamlopt
- $(MAKE) -C '$(1)' opt
+ $(MAKE) -C '$(1)' -j 1 opt
# Now build otherlibs for ocamlopt
cd '$(1)' && \
for i in $(OTHER_LIBS); do \
- $(MAKE) -C otherlibs/$$i clean; \
- $(MAKE) -C otherlibs/$$i all; \
- $(MAKE) -C otherlibs/$$i allopt; \
+ $(MAKE) -C otherlibs/$$i -j 1 clean; \
+ $(MAKE) -C otherlibs/$$i -j 1 all; \
+ $(MAKE) -C otherlibs/$$i -j 1 allopt; \
done
####### installation
- $(MAKE) -C '$(1)' install
- $(MAKE) -C '$(1)' installopt
+ $(MAKE) -C '$(1)' -j 1 install
+ $(MAKE) -C '$(1)' -j 1 installopt
# Rename all the binaries to target-binary
for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt \
ocamlprof camlp4prof camlp4boot camlp4 camlp4oof camlp4of camlp4o \