Browse Source

[LibOS,Pal] Move Makefile.Host under Scripts/

Isaku Yamahata 4 years ago
parent
commit
50bdec8a23

+ 0 - 1
LibOS/Makefile

@@ -1,6 +1,5 @@
 include ../Scripts/Makefile.configs
 include ../Scripts/Makefile.rules
-include ../Pal/src/Makefile.Host
 
 GLIBC_VERSION ?= 2.27
 GLIBC_SRC = glibc-$(GLIBC_VERSION)

+ 0 - 1
LibOS/shim/src/Makefile

@@ -1,7 +1,6 @@
 RUNTIME_DIR = $(CURDIR)/../../../Runtime
 
 include ../../../Scripts/Makefile.configs
-include ../../../Pal/src/Makefile.Host
 
 OMIT_FRAME_POINTER = no
 

+ 0 - 1
LibOS/shim/test/Makefile

@@ -1,5 +1,4 @@
 include ../../../Scripts/Makefile.configs
-include ../../../Pal/src/Makefile.Host
 
 # SUBDIRS = regression native inline benchmark
 SUBDIRS = native fs

+ 0 - 1
Makefile

@@ -1,5 +1,4 @@
 include Scripts/Makefile.configs
-include Pal/src/Makefile.Host
 
 targets = all clean format test sgx-tokens distclean
 

+ 0 - 1
Pal/Makefile

@@ -1,5 +1,4 @@
 include ../Scripts/Makefile.configs
-include src/Makefile.Host
 
 DIRS = src test regression
 

+ 0 - 1
Pal/lib/Makefile

@@ -1,6 +1,5 @@
 include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
-include ../src/Makefile.Host
 
 CFLAGS	= -Wall -fPIC -O2 -std=gnu99 -fgnu89-inline -U_FORTIFY_SOURCE \
 	  $(call cc-option,-Wnull-dereference) \

+ 0 - 1
Pal/regression/Makefile

@@ -1,5 +1,4 @@
 include ../../Scripts/Makefile.configs
-include ../src/Makefile.Host
 include ../../Scripts/Makefile.rules
 
 CFLAGS	= -Wall -O2 -std=c11 -fno-builtin -nostdlib \

+ 2 - 1
Pal/src/Makefile

@@ -3,7 +3,6 @@ export RUNTIME_DIR = $(CURDIR)/../../Runtime
 
 include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
-include Makefile.Host
 
 # Customizable PAL Targets
 # (specify in Makefile.am in host-specific directories)
@@ -27,6 +26,8 @@ ifeq ($(PROFILING),1)
 CFLAGS	+= -DPROFILING=1
 endif
 
+PAL_HOST_MACRO = $(shell echo $(PAL_HOST) | tr '[:lower:]' '[:upper:]' | tr '-' '_')
+
 # Build Targets:
 #     (1) Host-specific targets are in "host/{Host Name}".
 #     (2) Generic targets are in "host/{Host Name}/.obj".

+ 0 - 1
Pal/test/Makefile

@@ -1,5 +1,4 @@
 include ../../Scripts/Makefile.configs
-include ../src/Makefile.Host
 include ../../Scripts/Makefile.rules
 
 CFLAGS	= -Wall -O2 -std=c11 -fno-builtin -nostdlib -no-pie \

+ 1 - 1
Runtime/pal_loader

@@ -37,7 +37,7 @@ if [ -z $PAL_HOST ]; then
         PAL_HOST="${libpal%.so}"
         PAL_HOST="${PAL_HOST#libpal-}"
     else
-        PAL_HOST=$(/usr/bin/make --no-print-directory --quiet -f "$RUNTIME_DIR/../Scripts/Makefile.configs" -f "$RUNTIME_DIR/../Pal/src/Makefile.Host" print_host 2>&1)
+        PAL_HOST=$(/usr/bin/make --no-print-directory --quiet -f "$RUNTIME_DIR/../Scripts/Makefile.configs" print_host 2>&1)
     fi
 fi
 

+ 1 - 2
Pal/src/Makefile.Host → Scripts/Makefile.Host

@@ -1,7 +1,7 @@
 all_hosts = Skeleton Linux Linux-SGX
 
 ifneq ($(MAKEFILE_CONFIGS_INCLUDED),y)
-$(error Makfile.configs must be included before Makefile.Host)
+$(error do not include Makefile.Host directly. include Makefile.configs)
 endif
 
 ifeq ($(PAL_HOST),)
@@ -25,7 +25,6 @@ $(error Unsupported platform: $(PAL_HOST))
 endif
 
 export PAL_HOST
-export PAL_HOST_MACRO = $(shell echo $(PAL_HOST) | tr '[:lower:]' '[:upper:]' | tr '-' '_')
 
 .DEFAULT_GOAL := all
 .PHONY: print_host

+ 0 - 1
Scripts/Makefile.Test

@@ -6,7 +6,6 @@ SHIMDIR = $(abspath $(SCRIPTS_DIR)/../LibOS/shim)
 RUNTIME = $(abspath $(SCRIPTS_DIR)/../Runtime)
 
 include $(SCRIPTS_DIR)/Makefile.configs
-include $(PALDIR)/Makefile.Host
 include $(SCRIPTS_DIR)/Makefile.rules
 include $(SCRIPTS_DIR)/Makefile.manifest
 

+ 3 - 0
Scripts/Makefile.configs

@@ -1,3 +1,5 @@
+MAKEFILE_CONFIGS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+
 ifeq ($(origin CC),default)
 CC	= gcc
 endif
@@ -25,3 +27,4 @@ DEBUG ?=
 export DEBUG
 
 MAKEFILE_CONFIGS_INCLUDED = y
+include $(MAKEFILE_CONFIGS_DIR)/Makefile.Host