oscarlab · HW42 · Aug 28, 2019 · Aug 28, 2019
diff --git a/apache/Makefile b/apache/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 HOST ?= 127.0.0.1
 PORT ?= 8001
 

diff --git a/bash/Makefile b/bash/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 BASH_DIR = bash-4.1
 
 manifests = $(addsuffix .manifest,bash ls cp rm cat date)

diff --git a/busybox/Makefile b/busybox/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 exec_target = busybox.manifest busybox_nofork.manifest
 target = busybox busybox_gdb busybox_nofork busybox_nofork_gdb
 

diff --git a/curl/Makefile b/curl/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 manifests = curl.manifest
 
 target =

diff --git a/gcc/Makefile b/gcc/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 test_files = test_files
 
 exec_target = $(addsuffix .manifest,gcc as ld cc1 collect2)

diff --git a/lighttpd/Makefile b/lighttpd/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 manifests = lighttpd.manifest lighttpd-angel.manifest
 SRCDIR = lighttpd-1.4.30
 HOST = 127.0.0.1

diff --git a/lmbench/Makefile b/lmbench/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 LMBENCHDIR = lmbench-2.5
 LINUXDIR = $(LMBENCHDIR)/bin/linux/
 

diff --git a/ltp/Makefile b/ltp/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 SRCDIR = src
 BUILDDIR = opt/ltp
 TESTCASEDIR = $(BUILDDIR)/testcases/bin

diff --git a/ltp/edit_sys_tests.awk b/ltp/edit_sys_tests.awk
@@ -5,7 +5,7 @@ BEGIN{
 		blocked[test]
 	}
 
-	if (SGX)  {
+	if (ENVIRON["SGX"])  {
 	    pal_str = "./pal_loader SGX"
 	} else {
 	    pal_str = "./pal_loader"

diff --git a/ltp/syscalls.sh b/ltp/syscalls.sh
@@ -2,6 +2,6 @@
 
 cd `dirname $0`
 export LTPROOT=$PWD"/opt/ltp"
-awk -v SGX=$SGX_RUN -f edit_sys_tests.awk $LTPROOT/runtest/syscalls > syscalls.graphene
+awk -f edit_sys_tests.awk $LTPROOT/runtest/syscalls > syscalls.graphene
 cd $LTPROOT/../..
 python fetch.py
diff --git a/memcached/Makefile b/memcached/Makefile
@@ -15,6 +15,8 @@
 # Relative path to Graphene root
 GRAPHENEDIR = ../../../../..
 
+include $(GRAPHENEDIR)/build-config.mk
+
 SRCDIR = src
 COMMIT = master
 

diff --git a/nginx/Makefile b/nginx/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 manifests = nginx.manifest
 SRCDIR = nginx-1.10.1
 HOST = $(firstword $(shell ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' -m 1 | cut -d: -f2))

diff --git a/python/Makefile b/python/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 PYTHON_SRC = Python-2.7.9
 PYTHON_INSTALL = $(PYTHON_SRC)/build
 

diff --git a/r/Makefile b/r/Makefile
@@ -1,3 +1,5 @@
+include ../../../../../build-config.mk
+
 R_SRC = R-3.1.2
 R_INSTALL = $(R_SRC)/build