Mercurial > hg > graal-jvmci-8
diff mx/mx_graal_makefile.py @ 21793:44bad469bec2
Create DEST_SUBDIR when doing install_jvm (JBS:GRAAL-52)
author | Stefan Anzinger <stefan.anzinger@oracle.com> |
---|---|
date | Mon, 08 Jun 2015 18:07:25 +0200 |
parents | 6db6070d30b9 |
children | 42452d2dfbec |
line wrap: on
line diff
--- a/mx/mx_graal_makefile.py Mon Jun 08 17:04:02 2015 +0200 +++ b/mx/mx_graal_makefile.py Mon Jun 08 18:07:25 2015 +0200 @@ -196,7 +196,7 @@ SHELL=sh -x endif -define process_options = +define process_options $(eval providers=$(1)/$(PROVIDERS_INF)) $(eval services=$(1)/$(SERVICES_INF)) $(eval options=$(1)/$(OPTIONS_INF)) @@ -209,13 +209,13 @@ test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) endef -define extract = +define extract $(eval TMP := $(shell mktemp -d $(1)_XXXXX)) - mkdir -p $(2) + mkdir -p $(2); 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)))) - rm -r $(TMP) - cp $(1) $(2) + ((test ! -d .$(SERVICES_INF) || cp -r .$(SERVICES_INF) $(abspath $(2))) && (test ! -d .$(OPTIONS_INF) || cp -r .$(OPTIONS_INF) $(abspath $(2)))); + rm -r $(TMP); + cp $(1) $(2); endef