Mercurial > hg > graal-jvmci-8

comparison make/jvmci.make @ 21944:b121c00d3c4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
21943:31be1c8f4905 21944:b121c00d3c4c
96 $(foreach file,$(1),$(if $(findstring $(file),$(exports)), ,$(error "Pattern '$(2)$(file)' not found in $(defs)"))) 96 $(foreach file,$(1),$(if $(findstring $(file),$(exports)), ,$(error "Pattern '$(2)$(file)' not found in $(defs)")))
97 $(foreach export,$(exports),$(if $(findstring $(export),$(1)), ,$(error "The line '$(2)$(export)' should not be in $(defs)"))) 97 $(foreach export,$(exports),$(if $(findstring $(export),$(1)), ,$(error "The line '$(2)$(export)' should not be in $(defs)")))
98 endef 98 endef
99 99
100 all: default 100 all: default
101 $(info Put $(EXPORTED_FILES) into SHARED_DIR $(SHARED_DIR))
102 $(QUIETLY) $(shell mkdir -p $(SHARED_DIR))
103 $(foreach export,$(EXPORTED_FILES),$(call extract,$(export),$(SHARED_DIR)))
101 104
102 export: all 105 export: all
103 $(info Put $(EXPORTED_FILES) into SHARED_DIR $(SHARED_DIR))
104 $(QUIETLY) mkdir -p $(SHARED_DIR)
105 $(foreach export,$(EXPORTED_FILES),$(call extract,$(export),$(SHARED_DIR)))
106 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.services/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/) 106 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.services/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_SERVICES_DIR)/)
107 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.options/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/) 107 $(call verify_defs_make,$(notdir $(wildcard $(SHARED_DIR)/jvmci.options/*)),EXPORT_LIST += $$(EXPORT_JRE_LIB_JVMCI_OPTIONS_DIR)/)
108 .PHONY: export 108 .PHONY: export
109 109
110 110