Mercurial > hg > graal-jvmci-8

comparison make/Makefile @ 21740:6c3c21d9b5ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
21739:73809f97c281 21740:6c3c21d9b5ef
307 $(CD) $(OUTPUTDIR); \ 307 $(CD) $(OUTPUTDIR); \
308 $(MAKE) -f $(ABS_OS_MAKEFILE) \ 308 $(MAKE) -f $(ABS_OS_MAKEFILE) \
309 $(MAKE_ARGS) $(VM_TARGET) 309 $(MAKE_ARGS) $(VM_TARGET)
310 310
311 311
312 312 ifeq ($(JVMCI_USE_MAKE),)
313 ifeq (, $(shell python2.7 --version 2>/dev/null && echo ok)) 313 ifeq (, $(shell python2.7 --version 2>/dev/null && echo ok))
314 ifeq (, $(shell python2.6 --version 2>/dev/null && echo ok)) 314 ifeq (, $(shell python2.6 --version 2>/dev/null && echo ok))
315 PYTHON=python 315 PYTHON=python
316 else
317 PYTHON=python2.6
318 endif
316 else 319 else
317 PYTHON=python2.6 320 PYTHON=python2.7
318 endif 321 endif
319 else 322
320 PYTHON=python2.7 323 # Builds code that can be shared among different build flavors
321 endif
322
323 # Builds code that can be shared among different build flavors
324 buildshared: 324 buildshared:
325 $(PYTHON) -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR) 325 $(PYTHON) -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR)
326 #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 326 else
327 buildshared:
328 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
329 endif
330
327 331
328 # Export file rule 332 # Export file rule
329 generic_export: $(EXPORT_LIST) 333 generic_export: $(EXPORT_LIST)
330 334
331 export_product: 335 export_product: