Mercurial > hg > graal-compiler
diff make/Makefile @ 21740:6c3c21d9b5ef
Add -m switch to mx build, which builds/exports JVMCI with the make/jvmci.make file
| author | Stefan Anzinger <stefan.anzinger@oracle.com> |
|---|---|
| date | Fri, 05 Jun 2015 10:00:06 +0200 |
| parents | b5bbf03bc17a |
| children | b6ee5d3f3255 |
line wrap: on
line diff
--- a/make/Makefile Fri Jun 05 07:06:56 2015 +0200 +++ b/make/Makefile Fri Jun 05 10:00:06 2015 +0200 @@ -309,21 +309,25 @@ $(MAKE_ARGS) $(VM_TARGET) - -ifeq (, $(shell python2.7 --version 2>/dev/null && echo ok)) - ifeq (, $(shell python2.6 --version 2>/dev/null && echo ok)) - PYTHON=python +ifeq ($(JVMCI_USE_MAKE),) + ifeq (, $(shell python2.7 --version 2>/dev/null && echo ok)) + ifeq (, $(shell python2.6 --version 2>/dev/null && echo ok)) + PYTHON=python + else + PYTHON=python2.6 + endif else - PYTHON=python2.6 + PYTHON=python2.7 endif + + # Builds code that can be shared among different build flavors +buildshared: + $(PYTHON) -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR) else - PYTHON=python2.7 +buildshared: + cd .. && $(MAKE) -f make/jvmci.make TARGET=build/make MX_TARGET=. HS_COMMON_SRC=$(HS_COMMON_SRC) JDK=$(ABS_BOOTDIR) EXPORT_DIR=$(SHARED_DIR) VERBOSE=0 export endif -# Builds code that can be shared among different build flavors -buildshared: - $(PYTHON) -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR) - #cd .. && $(MAKE) -f make/jvmci.make TARGET=build/make MX_TARGET=. HS_COMMON_SRC=$(HS_COMMON_SRC) JDK=$(ABS_BOOTDIR) EXPORT_DIR=$(SHARED_DIR) VERBOSE=0 export # Export file rule generic_export: $(EXPORT_LIST)