Mercurial > hg > truffle
changeset 21797:42452d2dfbec
removed MX_TARGET; replace VERBOSE with MAKE_VERBOSE
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 08 Jun 2015 23:40:08 +0200 |
| parents | 1c22030625eb |
| children | 395ac43a8578 |
| files | make/Makefile make/jvmci.make mx/mx_graal_makefile.py |
| diffstat | 3 files changed, 15 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Mon Jun 08 22:32:04 2015 +0200 +++ b/make/Makefile Mon Jun 08 23:40:08 2015 +0200 @@ -308,11 +308,16 @@ $(MAKE) -f $(ABS_OS_MAKEFILE) \ $(MAKE_ARGS) $(VM_TARGET) + buildshared: - cd .. && $(MAKE) -f make/jvmci.make TARGET=build/make MX_TARGET=. HS_COMMON_SRC=$(HS_COMMON_SRC) ABS_BOOTDIR=$(ABS_BOOTDIR) EXPORT_DIR=$(SHARED_DIR) export + cd .. && \ + $(MAKE) -f make/jvmci.make \ + TARGET=build/make \ + HS_COMMON_SRC=$(HS_COMMON_SRC) \ + ABS_BOOTDIR=$(ABS_BOOTDIR) \ + EXPORT_DIR=$(SHARED_DIR) export # Export file rule -$(info $(EXPORT_LIST)) generic_export: $(EXPORT_LIST) export_product:
--- a/make/jvmci.make Mon Jun 08 22:32:04 2015 +0200 +++ b/make/jvmci.make Mon Jun 08 23:40:08 2015 +0200 @@ -1,7 +1,6 @@ # This Makefile is generated automatically, do not edit -# This file was build with command: mx.sh makefile -o make/jvmci.make +# This file was built with the command: mx.sh makefile -o make/jvmci.make -VERBOSE= TARGET=. # Bootstrap JDK to be used (for javac and jar) ABS_BOOTDIR= @@ -9,7 +8,6 @@ JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target 1.8 JAR=$(ABS_BOOTDIR)/bin/jar -EXPORT_DIR=export EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services HS_COMMON_SRC=. @@ -21,7 +19,7 @@ ifeq ($(ABS_BOOTDIR),) $(error Variable ABS_BOOTDIR must be set to a JDK installation.) endif -ifneq ($(VERBOSE),) +ifneq ($(MAKE_VERBOSE),) SHELL=sh -x endif @@ -32,7 +30,8 @@ test -d $(services) || mkdir -p $(services) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) - # We're building all projects together with one javac call; thus we cannot determine, from which project the generated file is thus we hardcode it for now + # Since all projects are built together with one javac call we cannot determine + # which project contains HotSpotVMConfig.inline.hpp so we hardcode it. $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp) $(eval vmconfigDest=$(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest))
--- a/mx/mx_graal_makefile.py Mon Jun 08 22:32:04 2015 +0200 +++ b/mx/mx_graal_makefile.py Mon Jun 08 23:40:08 2015 +0200 @@ -170,9 +170,8 @@ jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH" mf.add_definition("""# This Makefile is generated automatically, do not edit -# This file was build with command: """ + commandline + """ +# This file was built with the command: """ + commandline + """ -VERBOSE= TARGET=. # Bootstrap JDK to be used (for javac and jar) ABS_BOOTDIR= @@ -180,7 +179,6 @@ JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(java.javaCompliance) + """ JAR=$(ABS_BOOTDIR)/bin/jar -EXPORT_DIR=export EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services HS_COMMON_SRC=. @@ -192,7 +190,7 @@ ifeq ($(ABS_BOOTDIR),) $(error Variable ABS_BOOTDIR must be set to a JDK installation.) endif -ifneq ($(VERBOSE),) +ifneq ($(MAKE_VERBOSE),) SHELL=sh -x endif @@ -203,7 +201,8 @@ test -d $(services) || mkdir -p $(services) test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) - # We're building all projects together with one javac call; thus we cannot determine, from which project the generated file is thus we hardcode it for now + # Since all projects are built together with one javac call we cannot determine + # which project contains HotSpotVMConfig.inline.hpp so we hardcode it. $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp) $(eval vmconfigDest=$(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot) test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest))