Mercurial > hg > graal-compiler

comparison mx/mx_graal_makefile.py @ 21797:42452d2dfbec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
168 bootClassPath = java.bootclasspath() 168 bootClassPath = java.bootclasspath()
169 bootClassPath = bootClassPath.replace(java.jdk, "$(ABS_BOOTDIR)") 169 bootClassPath = bootClassPath.replace(java.jdk, "$(ABS_BOOTDIR)")
170 jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH" 170 jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH"
171 171
172 mf.add_definition("""# This Makefile is generated automatically, do not edit 172 mf.add_definition("""# This Makefile is generated automatically, do not edit
173 # This file was build with command: """ + commandline + """ 173 # This file was built with the command: """ + commandline + """
174 174
175 VERBOSE=
176 TARGET=. 175 TARGET=.
177 # Bootstrap JDK to be used (for javac and jar) 176 # Bootstrap JDK to be used (for javac and jar)
178 ABS_BOOTDIR= 177 ABS_BOOTDIR=
179 178
180 JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(java.javaCompliance) + """ 179 JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(java.javaCompliance) + """
181 JAR=$(ABS_BOOTDIR)/bin/jar 180 JAR=$(ABS_BOOTDIR)/bin/jar
182 181
183 EXPORT_DIR=export
184 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services 182 EXPORTED_FILES_ADDITIONAL=$(TARGET)/options $(TARGET)/services
185 HS_COMMON_SRC=. 183 HS_COMMON_SRC=.
186 184
187 # Directories, where the generated property-files reside within the JAR files 185 # Directories, where the generated property-files reside within the JAR files
188 PROVIDERS_INF=/META-INF/providers/ 186 PROVIDERS_INF=/META-INF/providers/
190 OPTIONS_INF=/META-INF/options/ 188 OPTIONS_INF=/META-INF/options/
191 189
192 ifeq ($(ABS_BOOTDIR),) 190 ifeq ($(ABS_BOOTDIR),)
193 $(error Variable ABS_BOOTDIR must be set to a JDK installation.) 191 $(error Variable ABS_BOOTDIR must be set to a JDK installation.)
194 endif 192 endif
195 ifneq ($(VERBOSE),) 193 ifneq ($(MAKE_VERBOSE),)
196 SHELL=sh -x 194 SHELL=sh -x
197 endif 195 endif
198 196
199 define process_options 197 define process_options
200 $(eval providers=$(1)/$(PROVIDERS_INF)) 198 $(eval providers=$(1)/$(PROVIDERS_INF))
201 $(eval services=$(1)/$(SERVICES_INF)) 199 $(eval services=$(1)/$(SERVICES_INF))
202 $(eval options=$(1)/$(OPTIONS_INF)) 200 $(eval options=$(1)/$(OPTIONS_INF))
203 test -d $(services) || mkdir -p $(services) 201 test -d $(services) || mkdir -p $(services)
204 test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done) 202 test ! -d $(providers) || (cd $(providers) && for i in $$(ls); do c=$$(cat $$i); echo $$i >> $(abspath $(services))/$$c; rm $$i; done)
205 203
206 # 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 204 # Since all projects are built together with one javac call we cannot determine
205 # which project contains HotSpotVMConfig.inline.hpp so we hardcode it.
207 $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp) 206 $(eval vmconfig=$(1)/hotspot/HotSpotVMConfig.inline.hpp)
208 $(eval vmconfigDest=$(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot) 207 $(eval vmconfigDest=$(HS_COMMON_SRC)/../graal/com.oracle.jvmci.hotspot/src_gen/hotspot)
209 test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest)) 208 test ! -f $(vmconfig) || (mkdir -p $(vmconfigDest) && cp $(vmconfig) $(vmconfigDest))
210 endef 209 endef
211 210