Forráskód Böngészése

[Scripts] Remove PAL_LOADER variable from Makefile.test

Isaku Yamahata 4 éve
szülő
commit
72ddedc065
1 módosított fájl, 2 hozzáadás és 8 törlés
  1. 2 8
      Scripts/Makefile.Test

+ 2 - 8
Scripts/Makefile.Test

@@ -9,12 +9,6 @@ include $(SCRIPTS_DIR)/Makefile.configs
 include $(SCRIPTS_DIR)/Makefile.rules
 include $(SCRIPTS_DIR)/Makefile.manifest
 
-ifeq ($(SGX),1)
-PAL_LOADER = pal_loader SGX
-else
-PAL_LOADER = pal_loader
-endif
-
 CFLAGS += -Wall -std=gnu99
 CXXFLAGS += -Wall -std=c++14
 LDFLAGS	+=
@@ -36,7 +30,7 @@ sgx-tokens: $(call expand_target_to_token,$(exec_target))
 
 ifeq ($(ABSPATH_IN_MANIFEST),yes)
 manifest_rules = \
-	-e 's:\$$(PAL):$(abspath $(RUNTIME))/$(PAL_LOADER):g' \
+	-e 's:\$$(PAL):$(abspath $(RUNTIME))/pal_loader:g' \
 	-e 's:\$$(PWD):$(PWD):g' \
 	-e 's:\$$(BIN):$(subst .manifest,,$(notdir $@)):g' \
 	-e 's:\$$(SHIMPATH):$(abspath $(RUNTIME))/libsysdb.so:g' \
@@ -44,7 +38,7 @@ manifest_rules = \
 	$(extra_rules)
 else
 manifest_rules= \
-	-e 's:\$$(PAL):$(abspath $(RUNTIME))/$(PAL_LOADER):g' \
+	-e 's:\$$(PAL):$(abspath $(RUNTIME))/pal_loader:g' \
 	-e 's:\$$(PWD):$(PWD):g' \
 	-e 's:\$$(BIN):$(subst .manifest,,$(notdir $@)):g' \
 	-e 's:\$$(SHIMPATH):$(RUNTIME)/libsysdb.so:g' \