comparison make/Makefile @ 10083:8dc4cdde75fb

remove build-graal.xml and have make directly call mx to generate graal.jar
author Doug Simon <doug.simon@oracle.com>
date Tue, 18 Jun 2013 18:17:04 +0200
parents 2a091d2987bd
children dcc1994e523e
comparison
equal deleted inserted replaced
10082:665e95c28965 10083:8dc4cdde75fb
269 $(MAKE_ARGS) $(VM_TARGET) 269 $(MAKE_ARGS) $(VM_TARGET)
270 270
271 271
272 # Builds code that can be shared among different build flavors 272 # Builds code that can be shared among different build flavors
273 buildshared: 273 buildshared:
274 ifeq ($(BUILD_GRAAL_JAR),true) 274 if type -p python2.7 >/dev/null 2>&1 ; then \
275 $(REMOTE) $(ANT) -f $(GAMMADIR)/make/build-graal.xml -Dgamma.dir=$(GAMMADIR) -Dshared.dir=$(SHARED_DIR) 275 PYTHON_EXE=$$(type -p python2.7); \
276 endif 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)
277 286
278 # Export file rule 287 # Export file rule
279 generic_export: $(EXPORT_LIST) 288 generic_export: $(EXPORT_LIST)
280 export_product: 289 export_product:
281 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \ 290 $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \