Mercurial > hg > graal-jvmci-8
changeset 21944:b121c00d3c4c
fixed subtle makefile evaluation order issue in the verification that only existing JVMCI services and options are exported in make/defs.make
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 12 Jun 2015 15:34:11 +0200 |
parents | 31be1c8f4905 |
children | 0458778bb188 |
files | make/jvmci.make mx/mx_graal_makefile.py |
diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jvmci.make Fri Jun 12 15:33:11 2015 +0200 +++ b/make/jvmci.make Fri Jun 12 15:34:11 2015 +0200 @@ -98,11 +98,11 @@ endef all: default + $(info Put $(EXPORTED_FILES) into SHARED_DIR $(SHARED_DIR)) + $(QUIETLY) $(shell mkdir -p $(SHARED_DIR)) + $(foreach export,$(EXPORTED_FILES),$(call extract,$(export),$(SHARED_DIR))) export: all - $(info Put $(EXPORTED_FILES) into SHARED_DIR $(SHARED_DIR)) - $(QUIETLY) mkdir -p $(SHARED_DIR) - $(foreach export,$(EXPORTED_FILES),$(call extract,$(export),$(SHARED_DIR))) $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.services/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/) $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.options/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/) .PHONY: export
--- a/mx/mx_graal_makefile.py Fri Jun 12 15:33:11 2015 +0200 +++ b/mx/mx_graal_makefile.py Fri Jun 12 15:34:11 2015 +0200 @@ -258,11 +258,11 @@ endef all: default +\t$(info Put $(EXPORTED_FILES) into SHARED_DIR $(SHARED_DIR)) +\t$(QUIETLY) $(shell mkdir -p $(SHARED_DIR)) +\t$(foreach export,$(EXPORTED_FILES),$(call extract,$(export),$(SHARED_DIR))) export: all -\t$(info Put $(EXPORTED_FILES) into SHARED_DIR $(SHARED_DIR)) -\t$(QUIETLY) mkdir -p $(SHARED_DIR) -\t$(foreach export,$(EXPORTED_FILES),$(call extract,$(export),$(SHARED_DIR))) \t$(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.services/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/) \t$(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.options/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/) .PHONY: export