Mercurial > hg > graal-compiler
diff make/Makefile @ 18641:e22a21b27036
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sun, 07 Dec 2014 20:43:33 +0100 |
| parents | 39441c10d314 |
| children | 7848fc12602b |
line wrap: on
line diff
--- a/make/Makefile Fri Dec 05 11:09:57 2014 +0100 +++ b/make/Makefile Sun Dec 07 20:43:33 2014 +0100 @@ -306,9 +306,20 @@ $(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 + else + PYTHON=python2.6 + endif +else + PYTHON=python2.7 +endif + # Builds code that can be shared among different build flavors buildshared: - python2 -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR) + $(PYTHON) -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR) # Export file rule generic_export: $(EXPORT_LIST)