Introduce Makefile.configs as a single place to allow override of configuration variables CC, AS, AR, and LD.
@@ -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 \
@@ -0,0 +1,12 @@
+ifeq ($(origin CC),default)
+CC = gcc
+endif
+ifeq ($(origin AS),default)
+AS = gcc
+ifeq ($(origin AR),default)
+AR = ar rcs
+ifeq ($(origin LD),default)
+LD = ld
@@ -1,8 +1,6 @@
+include ../../Makefile.configs
include ../src/Makefile.Host
CFLAGS = -Wall -fPIC -O2 -std=gnu99 -fgnu89-inline -U_FORTIFY_SOURCE \
$(call cc-option,-Wnull-dereference) \
-fno-omit-frame-pointer \
@@ -1,6 +1,7 @@
export PAL_DIR = $(CURDIR)
export RUNTIME_DIR = $(CURDIR)/../../Runtime
include ../../Makefile.rules
include Makefile.Host
@@ -1,3 +1,4 @@
+include ../../../../Makefile.configs
include Makefile.am
CFLAGS += -I. -Iinclude -I../.. -I../../../include -I../../../lib -I../../../ipc/linux \
@@ -1,11 +1,6 @@
# Add host-specific compilation rules here
HOST_DIR = host/$(PAL_HOST)
-fno-stack-protector -fno-builtin
CFLAGS += -I. -Iinclude -I../.. -I../../../include -I../../../lib -Isgx-driver
CFLAGS = -Wall -fPIC -O2 -maes -std=c11 -U_FORTIFY_SOURCE \
-fno-stack-protector -fno-builtin -DIN_ENCLAVE
CFLAGS += -I. -Iinclude -I../.. -I../../../include -I../../../lib \
@@ -2,11 +2,6 @@
SEC_DIR = security/$(PAL_HOST)
CFLAGS = -Wall -fPIC -O2 -std=c11 -U_FORTIFY_SOURCE \
CFLAGS += -I. -I../.. -I../../../include -I../../../lib
@@ -1,9 +1,5 @@
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 =
@@ -1,5 +1,4 @@
CFLAGS = -Wall -fPIC -O2 -std=c11 -Wall -U_FORTIFY_SOURCE \
-fno-stack-protector -fno-builtin \