Browse Source

[LibOS,Pal] Eliminate creation of host_endian.h symlink

This file should be included via include path, not via a symlink.
Isaku Yamahata 4 years ago
parent
commit
8d65898d91

+ 1 - 5
LibOS/shim/src/Makefile

@@ -70,12 +70,8 @@ libsysdb_debug.so: $(addsuffix .o,$(filter-out syscallas,$(objs))) \
 		   $(graphene_lib) $(pal_lib)
 	$(call cmd,ld_so_o)
 
-.lib/host_endian.h: ../../../Pal/src/host/$(PAL_HOST)/host_endian.h
-	@mkdir -p .lib
-	$(call cmd,ln_sf)
-
 .PHONY: graphene_lib_recurse
-graphene_lib_recurse: .lib/host_endian.h
+graphene_lib_recurse:
 	$(MAKE) -C ../../../Pal/lib target=$(abspath .lib)/
 
 $(graphene_lib): graphene_lib_recurse

+ 1 - 9
Pal/lib/Makefile

@@ -2,15 +2,7 @@ include ../../Scripts/Makefile.configs
 include ../../Scripts/Makefile.rules
 include ../src/host/$(PAL_HOST)/Makefile.am
 
-CFLAGS += -I. -I../include -I../src -Icrypto/mbedtls/include
-
-# Include host_endian.h from either the host-specific directory,
-# or directly under the target directory.
-ifeq ($(target),)
-CFLAGS += -I../src/host/$(PAL_HOST)
-else
-CFLAGS += -I$(target)
-endif
+CFLAGS += -I. -I../include -I../src -Icrypto/mbedtls/include -I../src/host/$(PAL_HOST)
 
 subdirs = string stdlib network graphene crypto
 

+ 1 - 5
Pal/regression/Makefile

@@ -107,11 +107,7 @@ Bootstrap5.manifest.sgx.d: %.manifest.sgx.d: %.manifest
 endif
 endif
 
-.lib/host_endian.h: ../src/host/$(PAL_HOST)/host_endian.h
-	@mkdir -p .lib
-	cp -f $< $@
-
-$(graphene_lib): .lib/host_endian.h
+$(graphene_lib):
 	$(MAKE) -C ../lib target=$(abspath .lib)/
 
 export PAL_LOADER = $(RUNTIME_DIR)/pal-$(PAL_HOST)

+ 1 - 5
Pal/src/Makefile

@@ -68,13 +68,9 @@ files_to_install = $(runtime_loader) $(runtime_lib) $(runtime_sec) $(runtime_gdb
 .PHONY: all
 all: $(files_to_build) $(files_to_install)
 
-$(LIB_DIR)/host_endian.h: $(HOST_DIR)/host_endian.h
-	@mkdir -p $(LIB_DIR)
-	$(call cmd,ln_sf)
-
 .PHONY: host_lib_recurse graphene_lib_recurse
 
-graphene_lib_recurse: $(LIB_DIR)/host_endian.h
+graphene_lib_recurse:
 	$(MAKE) -C ../lib target=$(abspath $(LIB_DIR))/
 
 $(graphene_lib): graphene_lib_recurse

+ 0 - 3
Pal/src/host/Linux-SGX/Makefile

@@ -26,9 +26,6 @@ graphene_lib = .lib/graphene-lib.a
 .PHONY: all
 all: sgx-driver/isgx_version.h $(host_files)
 
-../../host_endian.h: host_endian.h
-	$(MAKE) -C ../../ $<
-
 libpal-Linux-SGX.a: $(addsuffix .o,$(enclave-objs) $(enclave-asm-objs))
 	$(call cmd,ar_a_o)
 

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

@@ -16,9 +16,6 @@ headers	= $(wildcard *.h) $(wildcard ../../*.h) $(wildcard ../../../lib/*.h)
 .PHONY: all
 all: $(host_files)
 
-../../host_endian.h: host_endian.h
-	$(MAKE) -C ../../ $<
-
 libpal-Skeleton.a: $(addsuffix .o,$(objs))
 	$(call cmd,ar_a_o)
 

+ 1 - 5
Pal/test/Makefile

@@ -41,11 +41,7 @@ LDLIBS += $(graphene_lib) $(pal_lib) ../crt_init/user_start.o
 $(executables): %: %.c $(LDLIBS)
 	$(call cmd,csingle)
 
-.lib/host_endian.h: ../src/host/$(PAL_HOST)/host_endian.h
-	@mkdir -p .lib
-	cp -f $< $@
-
-$(graphene_lib): .lib/host_endian.h
+$(graphene_lib):
 	$(MAKE) -C ../lib target=$(abspath .lib)/
 
 ifeq ($(filter %clean,$(MAKECMDGOALS)),)