# HG changeset patch # User Stefan Anzinger # Date 1433941009 -7200 # Node ID 1a6a520af3b5a2ec9abc10a457374cf0fd18c7be # Parent 899d7cadd0a197116a545ed0572edfb368f2e00c jvmci.make put temp dirs into the target directory diff -r 899d7cadd0a1 -r 1a6a520af3b5 make/jvmci.make --- a/make/jvmci.make Wed Jun 10 13:22:03 2015 +0200 +++ b/make/jvmci.make Wed Jun 10 14:56:49 2015 +0200 @@ -38,7 +38,7 @@ endef define extract - $(eval TMP := $(shell mktemp -d tmp_XXXXX)) + $(eval TMP := $(shell mktemp -d $(TARGET)/tmp_XXXXX)) $(QUIETLY) mkdir -p $(2); $(QUIETLY) cd $(TMP) && $(JAR) xf $(abspath $(1)) && \ ((test ! -d .$(SERVICES_INF) || cp -r .$(SERVICES_INF) $(abspath $(2))) && (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2)))); @@ -48,7 +48,7 @@ define build_and_jar $(info Building $(4)) - $(eval TMP := $(shell mktemp -d JVMCI_HOTSPOT_XXXXX)) + $(eval TMP := $(shell mkdir -p $(TARGET) && mktemp -d $(TARGET)/tmp_XXXXX)) $(QUIETLY) $(JAVAC) -d $(TMP) -processorpath :$(1) -bootclasspath $(JDK_BOOTCLASSPATH) -cp :$(2) $(filter %.java,$?); $(QUIETLY) test "$(3)" = "" || cp -r $(3) $(TMP); $(QUIETLY) $(call process_options,$(TMP)); diff -r 899d7cadd0a1 -r 1a6a520af3b5 mx/mx_graal_makefile.py --- a/mx/mx_graal_makefile.py Wed Jun 10 13:22:03 2015 +0200 +++ b/mx/mx_graal_makefile.py Wed Jun 10 14:56:49 2015 +0200 @@ -205,7 +205,7 @@ endef define extract - $(eval TMP := $(shell mktemp -d tmp_XXXXX)) + $(eval TMP := $(shell mktemp -d $(TARGET)/tmp_XXXXX)) $(QUIETLY) mkdir -p $(2); $(QUIETLY) cd $(TMP) && $(JAR) xf $(abspath $(1)) && \\ ((test ! -d .$(SERVICES_INF) || cp -r .$(SERVICES_INF) $(abspath $(2))) && (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2)))); @@ -215,7 +215,7 @@ define build_and_jar $(info Building $(4)) - $(eval TMP := $(shell mktemp -d JVMCI_HOTSPOT_XXXXX)) + $(eval TMP := $(shell mkdir -p $(TARGET) && mktemp -d $(TARGET)/tmp_XXXXX)) $(QUIETLY) $(JAVAC) -d $(TMP) -processorpath :$(1) -bootclasspath $(JDK_BOOTCLASSPATH) -cp :$(2) $(filter %.java,$?); $(QUIETLY) test "$(3)" = "" || cp -r $(3) $(TMP); $(QUIETLY) $(call process_options,$(TMP));