From a0c208f71ea3ea72141285d170a8fe677beffa77 Mon Sep 17 00:00:00 2001
From: Don Porter <porter@cs.unc.edu>
Date: Tue, 21 May 2019 15:16:17 -0400
Subject: [PATCH] [Makefiles] Enable parallel make in Jenkins, fix parallel
 make for SGX

---
 Jenkinsfiles/Linux       | 2 +-
 Jenkinsfiles/Linux-Debug | 2 +-
 Jenkinsfiles/Linux-SGX   | 2 +-
 LibOS/Makefile           | 6 ++++++
 Pal/regression/Makefile  | 4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfiles/Linux b/Jenkinsfiles/Linux
index 6a64e08e..ff3b2c2d 100644
--- a/Jenkinsfiles/Linux
+++ b/Jenkinsfiles/Linux
@@ -6,7 +6,7 @@ pipeline {
                 stage('Build') {
                     steps {
                         sh '''
-                            make WERROR=1
+                            make -j 8 WERROR=1
                            '''
                     }
                 }
diff --git a/Jenkinsfiles/Linux-Debug b/Jenkinsfiles/Linux-Debug
index 5c58d7d2..54f2a1be 100644
--- a/Jenkinsfiles/Linux-Debug
+++ b/Jenkinsfiles/Linux-Debug
@@ -6,7 +6,7 @@ pipeline {
                 stage('Build') {
                     steps {
                         sh '''
-                            make DEBUG=1 WERROR=1
+                            make -j 8 DEBUG=1 WERROR=1
                            '''
                     }
                 }
diff --git a/Jenkinsfiles/Linux-SGX b/Jenkinsfiles/Linux-SGX
index ea1c8720..f39b7e24 100644
--- a/Jenkinsfiles/Linux-SGX
+++ b/Jenkinsfiles/Linux-SGX
@@ -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
diff --git a/LibOS/Makefile b/LibOS/Makefile
index 34fa1d2b..94e7621e 100644
--- a/LibOS/Makefile
+++ b/LibOS/Makefile
@@ -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
diff --git a/Pal/regression/Makefile b/Pal/regression/Makefile
index 3ba676f9..12a19889 100644
--- a/Pal/regression/Makefile
+++ b/Pal/regression/Makefile
@@ -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):