diff --git a/LibOS/shim/src/Makefile b/LibOS/shim/src/Makefile index 0b9f0e66..a1c27089 100644 --- a/LibOS/shim/src/Makefile +++ b/LibOS/shim/src/Makefile @@ -1,12 +1,8 @@ RUNTIME_DIR = $(CURDIR)/../../../Runtime +include ../../../Makefile.configs include ../../../Pal/src/Makefile.Host -CC = gcc -AS = gcc -AR = ar rcs -LD = ld - OMIT_FRAME_POINTER = no CFLAGS = -Wall -fPIC -std=c11 -Winline -Wwrite-strings \ diff --git a/Makefile.configs b/Makefile.configs new file mode 100644 index 00000000..3da199bc --- /dev/null +++ b/Makefile.configs @@ -0,0 +1,12 @@ +ifeq ($(origin CC),default) +CC = gcc +endif +ifeq ($(origin AS),default) +AS = gcc +endif +ifeq ($(origin AR),default) +AR = ar rcs +endif +ifeq ($(origin LD),default) +LD = ld +endif diff --git a/Pal/lib/Makefile b/Pal/lib/Makefile index 1d99a0f4..60eb2472 100644 --- a/Pal/lib/Makefile +++ b/Pal/lib/Makefile @@ -1,8 +1,6 @@ +include ../../Makefile.configs include ../src/Makefile.Host -CC = gcc -AR = ar rcs - CFLAGS = -Wall -fPIC -O2 -std=gnu99 -fgnu89-inline -U_FORTIFY_SOURCE \ $(call cc-option,-Wnull-dereference) \ -fno-omit-frame-pointer \ diff --git a/Pal/src/Makefile b/Pal/src/Makefile index 2a83df44..f6680612 100644 --- a/Pal/src/Makefile +++ b/Pal/src/Makefile @@ -1,6 +1,7 @@ export PAL_DIR = $(CURDIR) export RUNTIME_DIR = $(CURDIR)/../../Runtime +include ../../Makefile.configs include ../../Makefile.rules include Makefile.Host diff --git a/Pal/src/host/FreeBSD/Makefile b/Pal/src/host/FreeBSD/Makefile index b4dd6093..54781724 100644 --- a/Pal/src/host/FreeBSD/Makefile +++ b/Pal/src/host/FreeBSD/Makefile @@ -1,3 +1,4 @@ +include ../../../../Makefile.configs include Makefile.am CFLAGS += -I. -Iinclude -I../.. -I../../../include -I../../../lib -I../../../ipc/linux \ diff --git a/Pal/src/host/FreeBSD/Makefile.am b/Pal/src/host/FreeBSD/Makefile.am index c286f6ac..7809dca3 100644 --- a/Pal/src/host/FreeBSD/Makefile.am +++ b/Pal/src/host/FreeBSD/Makefile.am @@ -1,11 +1,6 @@ # Add host-specific compilation rules here HOST_DIR = host/$(PAL_HOST) -CC = gcc -AS = gcc -AR = ar rcs -LD = ld - CFLAGS = -Wall -fPIC -O2 -std=gnu99 -fgnu89-inline -U_FORTIFY_SOURCE \ -fno-omit-frame-pointer \ -fno-stack-protector -fno-builtin diff --git a/Pal/src/host/Linux-SGX/Makefile b/Pal/src/host/Linux-SGX/Makefile index a97dfbae..d185d49e 100644 --- a/Pal/src/host/Linux-SGX/Makefile +++ b/Pal/src/host/Linux-SGX/Makefile @@ -1,3 +1,4 @@ +include ../../../../Makefile.configs include Makefile.am CFLAGS += -I. -Iinclude -I../.. -I../../../include -I../../../lib -Isgx-driver diff --git a/Pal/src/host/Linux-SGX/Makefile.am b/Pal/src/host/Linux-SGX/Makefile.am index 4bed7740..943eb691 100644 --- a/Pal/src/host/Linux-SGX/Makefile.am +++ b/Pal/src/host/Linux-SGX/Makefile.am @@ -1,11 +1,6 @@ # Add host-specific compilation rules here HOST_DIR = host/$(PAL_HOST) -CC = gcc -AS = gcc -AR = ar rcs -LD = ld - CFLAGS = -Wall -fPIC -O2 -maes -std=c11 -U_FORTIFY_SOURCE \ -fno-omit-frame-pointer \ -fno-stack-protector -fno-builtin -DIN_ENCLAVE diff --git a/Pal/src/host/Linux/Makefile b/Pal/src/host/Linux/Makefile index c9055410..bdccfe45 100644 --- a/Pal/src/host/Linux/Makefile +++ b/Pal/src/host/Linux/Makefile @@ -1,3 +1,4 @@ +include ../../../../Makefile.configs include Makefile.am CFLAGS += -I. -Iinclude -I../.. -I../../../include -I../../../lib \ diff --git a/Pal/src/host/Linux/Makefile.am b/Pal/src/host/Linux/Makefile.am index beaed4ba..94d22bf8 100644 --- a/Pal/src/host/Linux/Makefile.am +++ b/Pal/src/host/Linux/Makefile.am @@ -2,11 +2,6 @@ HOST_DIR = host/$(PAL_HOST) SEC_DIR = security/$(PAL_HOST) -CC = gcc -AS = gcc -AR = ar rcs -LD = ld - CFLAGS = -Wall -fPIC -O2 -std=c11 -U_FORTIFY_SOURCE \ -fno-stack-protector -fno-builtin diff --git a/Pal/src/host/Skeleton/Makefile b/Pal/src/host/Skeleton/Makefile index 3910587b..a89244bd 100644 --- a/Pal/src/host/Skeleton/Makefile +++ b/Pal/src/host/Skeleton/Makefile @@ -1,3 +1,4 @@ +include ../../../../Makefile.configs include Makefile.am CFLAGS += -I. -I../.. -I../../../include -I../../../lib diff --git a/Pal/src/host/Skeleton/Makefile.am b/Pal/src/host/Skeleton/Makefile.am index 42ddc1b0..267877e9 100644 --- a/Pal/src/host/Skeleton/Makefile.am +++ b/Pal/src/host/Skeleton/Makefile.am @@ -1,9 +1,5 @@ # Add host-specific compilation rules here -CC = gcc -AS = gcc -AR = ar rcs - CFLAGS = -Wall -fPIC -O2 -std=gnu99 -fgnu89-inline -Wall -U_FORTIFY_SOURCE -fno-builtin ASFLAGS = -DPIC -DSHARED -fPIC -DASSEMBLER -Wa,--noexecstack -x assembler-with-cpp ARFLAGS = diff --git a/Pal/src/security/Linux/Makefile b/Pal/src/security/Linux/Makefile index 5eaa83cd..a2678cfb 100644 --- a/Pal/src/security/Linux/Makefile +++ b/Pal/src/security/Linux/Makefile @@ -1,5 +1,4 @@ -CC = gcc -LD = ld +include ../../../../Makefile.configs CFLAGS = -Wall -fPIC -O2 -std=c11 -Wall -U_FORTIFY_SOURCE \ -fno-stack-protector -fno-builtin \