# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1434116051 -7200
# Node ID b121c00d3c4c2d639facd1c8fafa3d75f57ba03c
# Parent  31be1c8f490538e3cb84a8353561d3f773605500
fixed subtle makefile evaluation order issue in the verification that only existing JVMCI services and options are exported in make/defs.make

diff -r 31be1c8f4905 -r b121c00d3c4c make/jvmci.make
--- 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
diff -r 31be1c8f4905 -r b121c00d3c4c mx/mx_graal_makefile.py
--- 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