Mercurial > hg > graal-jvmci-8

comparison mx.jvmci/mx_jvmci_makefile.py @ 22279:c232a2ea1fd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename mx.JDKConfig.jdk to mx.JDKConfig.home
author Doug Simon <doug.simon@oracle.com>
date Wed, 22 Jul 2015 12:21:44 +0200
parents 224416477bab
children 5cce6c398d70
comparison
equal deleted inserted replaced
22278:224416477bab 22279:c232a2ea1fd2
126 return 126 return
127 127
128 128
129 129
130 def do_build_makefile(mf, selectedDists): 130 def do_build_makefile(mf, selectedDists):
131 java = mx.get_jdk() 131 jdk = mx.get_jdk()
132 bootClassPath = java.bootclasspath() 132 bootClassPath = jdk.bootclasspath()
133 bootClassPath = bootClassPath.replace(os.path.realpath(java.jdk), "$(ABS_BOOTDIR)") 133 bootClassPath = bootClassPath.replace(os.path.realpath(jdk.home), "$(ABS_BOOTDIR)")
134 jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH" 134 jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH"
135 135
136 mf.add_definition("""# This Makefile is generated automatically, do not edit 136 mf.add_definition("""# This Makefile is generated automatically, do not edit
137 137
138 TARGET=. 138 TARGET=.
139 # Bootstrap JDK to be used (for javac and jar) 139 # Bootstrap JDK to be used (for javac and jar)
140 ABS_BOOTDIR= 140 ABS_BOOTDIR=
141 141
142 JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(java.javaCompliance) + """ 142 JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(jdk.javaCompliance) + """
143 JAR=$(ABS_BOOTDIR)/bin/jar 143 JAR=$(ABS_BOOTDIR)/bin/jar
144 144
145 HS_COMMON_SRC=. 145 HS_COMMON_SRC=.
146 146
147 # Directories, where the generated property-files reside within the JAR files 147 # Directories, where the generated property-files reside within the JAR files