[Makefiles] Enable parallel make in Jenkins, fix parallel make for SGX

This commit is contained in:
Don Porter
2019-06-20 19:16:10 -07:00
committed by Dmitrii Kuvaiskii
parent 08b535f759
commit a0c208f71e
5 changed files with 12 additions and 4 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ pipeline {
stage('Build') {
steps {
sh '''
make WERROR=1
make -j 8 WERROR=1
'''
}
}
+1 -1
View File
@@ -6,7 +6,7 @@ pipeline {
stage('Build') {
steps {
sh '''
make DEBUG=1 WERROR=1
make -j 8 DEBUG=1 WERROR=1
'''
}
}
+1 -1
View File
@@ -23,7 +23,7 @@ pipeline {
ISGX_DRIVER_PATH=/opt/intel/linux-sgx-driver ISGX_DRIVER_VERSION=1.9 make
'''
sh '''
make SGX=1 WERROR=1
make -j 8 SGX=1 WERROR=1
'''
sh '''
make SGX_RUN=1
+6
View File
@@ -97,6 +97,12 @@ $(GLIBC_SRC).tar.gz:
&& break; \
done
$(GLIBC_SRC)/elf/Versions: $(GLIBC_SRC)/configure
$(GLIBC_SRC)/nptl/Versions: $(GLIBC_SRC)/configure
$(GLIBC_SRC)/dlfcn/Versions: $(GLIBC_SRC)/configure
.PHONY: clean
clean:
$(MAKE) -C $(SHIM_DIR) clean
+3 -1
View File
@@ -43,7 +43,7 @@ manifest_rules = \
manifest: manifest.template
sed $(manifest_rules) $< >$@
%.manifest: %.manifest.template
%.manifest: %.manifest.template $(executables) $(pal_lib)
sed $(manifest_rules) $< >$@
(grep -q "#\!" $@ && chmod +x $@) || true
@@ -68,6 +68,8 @@ $(executables): %: %.c ../src/user_start.o \
$(graphene_lib): .lib/host_endian.h
$(MAKE) -C ../lib target=$(abspath .lib)/
Process2.manifest.sgx: Bootstrap.manifest.sgx
else
.IGNORE: $(preloads) $(executables)
$(preloads) $(executables):