Mercurial > hg > graal-jvmci-8
diff mx.jvmci/mx_jvmci_makefile.py @ 22279:c232a2ea1fd2
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 |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci_makefile.py Wed Jul 22 12:02:52 2015 +0200 +++ b/mx.jvmci/mx_jvmci_makefile.py Wed Jul 22 12:21:44 2015 +0200 @@ -128,9 +128,9 @@ def do_build_makefile(mf, selectedDists): - java = mx.get_jdk() - bootClassPath = java.bootclasspath() - bootClassPath = bootClassPath.replace(os.path.realpath(java.jdk), "$(ABS_BOOTDIR)") + jdk = mx.get_jdk() + bootClassPath = jdk.bootclasspath() + bootClassPath = bootClassPath.replace(os.path.realpath(jdk.home), "$(ABS_BOOTDIR)") jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH" mf.add_definition("""# This Makefile is generated automatically, do not edit @@ -139,7 +139,7 @@ # Bootstrap JDK to be used (for javac and jar) ABS_BOOTDIR= -JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(java.javaCompliance) + """ +JAVAC=$(ABS_BOOTDIR)/bin/javac -g -target """ + str(jdk.javaCompliance) + """ JAR=$(ABS_BOOTDIR)/bin/jar HS_COMMON_SRC=.