comparison make/Makefile @ 10084:dcc1994e523e

hard code use of python2.7 executable
author Doug Simon <doug.simon@oracle.com>
date Tue, 18 Jun 2013 18:35:18 +0200
parents 8dc4cdde75fb
children 836a62f43af9
comparison
equal deleted inserted replaced
10083:8dc4cdde75fb 10084:dcc1994e523e
84 ALT_OUT= 84 ALT_OUT=
85 endif 85 endif
86 86
87 # Directory for shared code (e.g. graal.jar) 87 # Directory for shared code (e.g. graal.jar)
88 SHARED_DIR=$(OUTPUTDIR)/shared 88 SHARED_DIR=$(OUTPUTDIR)/shared
89 BUILD_GRAAL_JAR ?= true
90 89
91 # Typical C1/C2 targets made available with this Makefile 90 # Typical C1/C2 targets made available with this Makefile
92 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1 91 C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
93 C2_VM_TARGETS=product fastdebug optimized debug 92 C2_VM_TARGETS=product fastdebug optimized debug
94 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero 93 ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
269 $(MAKE_ARGS) $(VM_TARGET) 268 $(MAKE_ARGS) $(VM_TARGET)
270 269
271 270
272 # Builds code that can be shared among different build flavors 271 # Builds code that can be shared among different build flavors
273 buildshared: 272 buildshared:
274 if type -p python2.7 >/dev/null 2>&1 ; then \ 273 python2.7 -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR)
275 PYTHON_EXE=$$(type -p python2.7); \
276 elif type -p python >/dev/null 2>&1 ; then \
277 PYTHON_EXE=$$(type -p python); \
278 echo "WARNING: Assuming $$PYTHON_EXE is version 2.7"; \
279 echo "To avoid this warning, ensure a 'python2.7' executable is on your PATH"; \
280 else \
281 echo "ERROR: Could not find Python 2.7"; \
282 echo "Ensure that a Python 2.7 executable is on your PATH as 'python2.7' or 'python'"; \
283 exit 1; \
284 fi; \
285 $$PYTHON_EXE -u $(GAMMADIR)/mxtool/mx.py build --no-native --export-dir $(SHARED_DIR)
286 274
287 # Export file rule 275 # Export file rule
288 generic_export: $(EXPORT_LIST) 276 generic_export: $(EXPORT_LIST)
289 export_product: 277 export_product:
290 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 278 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \