Mercurial > hg > graal-compiler

comparison make/Makefile @ 18641:e22a21b27036

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 07 Dec 2014 20:43:33 +0100
parents 39441c10d314
children 7848fc12602b
comparison
equal deleted inserted replaced
18640:02b5114b74c1 18641:e22a21b27036
304 $(CD) $(OUTPUTDIR); \ 304 $(CD) $(OUTPUTDIR); \
305 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 305 $(MAKE) -f $(ABS_OS_MAKEFILE) \
306 $(MAKE_ARGS) $(VM_TARGET) 306 $(MAKE_ARGS) $(VM_TARGET)
307 307
308 308
309
310 ifeq (, $(shell python2.7 --version 2>/dev/null && echo ok))
311 ifeq (, $(shell python2.6 --version 2>/dev/null && echo ok))
312 PYTHON=python
313 else
314 PYTHON=python2.6
315 endif
316 else
317 PYTHON=python2.7
318 endif
319
309 # Builds code that can be shared among different build flavors 320 # Builds code that can be shared among different build flavors
310 buildshared: 321 buildshared:
311 python2 -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR) 322 $(PYTHON) -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR)
312 323
313 # Export file rule 324 # Export file rule
314 generic_export: $(EXPORT_LIST) 325 generic_export: $(EXPORT_LIST)
315 326
316 export_product: 327 export_product: