comparison make/jvmci.make @ 21797:42452d2dfbec

removed MX_TARGET; replace VERBOSE with MAKE_VERBOSE
author Doug Simon <doug.simon@oracle.com>
date Mon, 08 Jun 2015 23:40:08 +0200
parents 44bad469bec2
children 395ac43a8578
comparison
equal deleted inserted replaced
21796:1c22030625eb 21797:42452d2dfbec
1 # This Makefile is generated automatically, do not edit 1 # This Makefile is generated automatically, do not edit
2 # This file was build with command: mx.sh makefile -o make/jvmci.make 2 # This file was built with the command: mx.sh makefile -o make/jvmci.make
3 3
4 VERBOSE=
5 TARGET=. 4 TARGET=.
6 # Bootstrap JDK to be used (for javac and jar) 5 # Bootstrap JDK to be used (for javac and jar)
7 ABS_BOOTDIR= 6 ABS_BOOTDIR=
8 7
9 JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target 1.8 8 JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target 1.8
10 JAR=$(ABS_BOOTDIR)/bin/jar 9 JAR=$(ABS_BOOTDIR)/bin/jar
11 10
12 EXPORT_DIR=export
13 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services 11 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services
14 HS_COMMON_SRC=. 12 HS_COMMON_SRC=.
15 13
16 # Directories, where the generated property-files reside within the JAR files 14 # Directories, where the generated property-files reside within the JAR files
17 PROVIDERS_INF=/META-INF/providers/ 15 PROVIDERS_INF=/META-INF/providers/
19 OPTIONS_INF=/META-INF/options/ 17 OPTIONS_INF=/META-INF/options/
20 18
21 ifeq ($(ABS_BOOTDIR),) 19 ifeq ($(ABS_BOOTDIR),)
22 $(error Variable ABS_BOOTDIR must be set to a JDK installation.) 20 $(error Variable ABS_BOOTDIR must be set to a JDK installation.)
23 endif 21 endif
24 ifneq ($(VERBOSE),) 22 ifneq ($(MAKE_VERBOSE),)
25 SHELL=sh -x 23 SHELL=sh -x
26 endif 24 endif
27 25
28 define process_options 26 define process_options
29 $(eval providers=$(1)/$(PROVIDERS_INF)) 27 $(eval providers=$(1)/$(PROVIDERS_INF))
30 $(eval services=$(1)/$(SERVICES_INF)) 28 $(eval services=$(1)/$(SERVICES_INF))
31 $(eval options=$(1)/$(OPTIONS_INF)) 29 $(eval options=$(1)/$(OPTIONS_INF))
32 test -d $(services) || mkdir -p $(services) 30 test -d $(services) || mkdir -p $(services)
33 test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) 31 test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done)
34 32
35 # We're building all projects together with one javac call; thus we cannot determine, from which project the generated file is thus we hardcode it for now 33 # Since all projects are built together with one javac call we cannot determine
34 # which project contains HotSpotVMConfig.inline.hpp so we hardcode it.
36 $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp) 35 $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp)
37 $(eval vmconfigDest=$(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot) 36 $(eval vmconfigDest=$(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot)
38 test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) 37 test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest))
39 endef 38 endef
40 39