Mercurial > hg > graal-compiler
changeset 21938:95956bc1b1a3
don't add command used to generate jvmci.make to the top of jvmci.make as it confuses the gate check that this file is in sync with suite*.py
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 12 Jun 2015 01:25:58 +0200 |
| parents | 3a292e8b9e51 |
| children | eac31af360db |
| files | make/jvmci.make mx/mx_graal.py mx/mx_graal_makefile.py |
| diffstat | 3 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/jvmci.make Fri Jun 12 01:19:57 2015 +0200 +++ b/make/jvmci.make Fri Jun 12 01:25:58 2015 +0200 @@ -1,5 +1,4 @@ # This Makefile is generated automatically, do not edit -# This file was built with the command: mx.sh makefile -o ./make/jvmci.make TARGET=. # Bootstrap JDK to be used (for javac and jar)
--- a/mx/mx_graal.py Fri Jun 12 01:19:57 2015 +0200 +++ b/mx/mx_graal.py Fri Jun 12 01:25:58 2015 +0200 @@ -1715,7 +1715,7 @@ with Task('Check jvmci.make in sync with suite.py', tasks) as t: if t: - jvmciMake = join(_graal_home, 'make', 'jvmci.make') + jvmciMake = join('make', 'jvmci.make') if mx_graal_makefile.build_makefile(['-o', jvmciMake]) != 0: t.abort('Rerun "mx makefile -o ' + jvmciMake + ' and check-in the modified ' + jvmciMake)
--- a/mx/mx_graal_makefile.py Fri Jun 12 01:19:57 2015 +0200 +++ b/mx/mx_graal_makefile.py Fri Jun 12 01:25:58 2015 +0200 @@ -159,7 +159,6 @@ jdkBootClassPathVariableName = "JDK_BOOTCLASSPATH" mf.add_definition("""# This Makefile is generated automatically, do not edit -# This file was built with the command: """ + commandline + """ TARGET=. # Bootstrap JDK to be used (for javac and jar)