summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2015-02-03 23:35:18 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2015-02-03 23:35:18 +0000
commit14c63140d9f621201880bffe707f64c8cebaff67 (patch)
treed1170fb0d4fbd47bbef8fd90f2d83424121af30c
parent031e09978124235e831175b4b1309fc7a3b7e711 (diff)
downloadgall-14c63140d9f621201880bffe707f64c8cebaff67.tar.gz
Attempt to improve compile time by parallelising make of libgit2
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e844f02..fe1db2c 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,9 @@ LFLAGS := -O1 -g -Llibgit2/build/gall-install/lib -lgit2 $(LIBGIT2_LDEPS) $(LFLA
MOD_FILES := $(patsubst %,%.lua,$(subst .,/,$(MODULES)))
+NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+DASH_J := -j $(shell expr \( $(NCPUS) \* 3 \) / 2)
+
install: cmodule
mkdir -p $(INST_ROOT)/gall
for MOD in $(sort $(MOD_FILES)); do \
@@ -47,7 +50,7 @@ lib/gall/ll/git2.so: libgit2/build/gall-install-stamp lib/gall/ll/git2.c
libgit2/build/gall-install-stamp:
mkdir -p libgit2/build
cd libgit2/build && cmake -DBUILD_SHARED_LIBS:BOOLEAN=OFF -DCMAKE_INSTALL_PREFIX:PATH=$(shell pwd)/libgit2/build/gall-install -DCMAKE_C_FLAGS=-fPIC ..
- cd libgit2/build && $(MAKE)
+ cd libgit2/build && $(MAKE) $(DASH_J)
echo "DISABLED BECAUSE LIBGIT2 AUTHORS ARE MAD: cd libgit2/build && $(MAKE) test"
cd libgit2/build && ./libgit2_clar -xonline
cd libgit2/build && $(MAKE) install DESTDIR=""