Mercurial > hg > truffle
changeset 21912:1a6a520af3b5
jvmci.make put temp dirs into the target directory
| author | Stefan Anzinger <stefan.anzinger@oracle.com> |
|---|---|
| date | Wed, 10 Jun 2015 14:56:49 +0200 |
| parents | 899d7cadd0a1 |
| children | a04b45953250 |
| files | make/jvmci.make mx/mx_graal_makefile.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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));
--- 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));