浏览代码

[Makefiles] Introduce Makefile.configs for configuration

Introduce Makefile.configs as a single place to allow override
of configuration variables CC, AS, AR, and LD.
Isaku Yamahata 5 年之前
父节点
当前提交
08b535f759

+ 1 - 5
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 \

+ 12 - 0
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

+ 1 - 3
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 \

+ 1 - 0
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
 

+ 1 - 0
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 \

+ 0 - 5
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

+ 1 - 0
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

+ 0 - 5
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

+ 1 - 0
Pal/src/host/Linux/Makefile

@@ -1,3 +1,4 @@
+include ../../../../Makefile.configs
 include Makefile.am
 
 CFLAGS	+= -I. -Iinclude -I../.. -I../../../include -I../../../lib \

+ 0 - 5
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
 

+ 1 - 0
Pal/src/host/Skeleton/Makefile

@@ -1,3 +1,4 @@
+include ../../../../Makefile.configs
 include Makefile.am
 
 CFLAGS  += -I. -I../.. -I../../../include -I../../../lib

+ 0 - 4
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 =

+ 1 - 2
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 \