Skip to content

Commit 4360698

Browse files
committed
[GR-12330] Depend on the ANTLR version that Truffle pulls in.
1 parent 89d811f commit 4360698

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

mx.graalpython/suite.py

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,6 @@
6666
#
6767
# --------------------------------------------------------------------------------------------------------------
6868
"libraries": {
69-
"ANTLR4": {
70-
"urls": [
71-
"http://www.antlr.org/download/antlr-runtime-4.7.jar"
72-
],
73-
"sha1": "30b13b7efc55b7feea667691509cf59902375001",
74-
},
75-
76-
"ANTLR4_COMPLETE": {
77-
"urls": [
78-
"http://www.antlr.org/download/antlr-4.7-complete.jar"
79-
],
80-
"sha1": "5b3a8824334069979a0862ce67ede796c3a4d1b1",
81-
},
8269
},
8370

8471
# --------------------------------------------------------------------------------------------------------------
@@ -132,14 +119,14 @@
132119
"com.oracle.graal.python.parser.antlr": {
133120
"subDir": "graalpython",
134121
"buildEnv": {
135-
"ANTLR_JAR": "<path:ANTLR4_COMPLETE>",
122+
"ANTLR_JAR": "<path:truffle:ANTLR4_COMPLETE>",
136123
"PARSER_PATH": "<src_dir:com.oracle.graal.python>/com/oracle/graal/python/parser/antlr",
137124
"OUTPUT_PATH": "<src_dir:com.oracle.graal.python>/com/oracle/graal/python/parser/antlr",
138125
"PARSER_PKG": "com.oracle.graal.python.parser.antlr",
139126
"POSTPROCESSOR": "<suite:graalpython>/graalpython/com.oracle.graal.python.parser.antlr/postprocess.py",
140127
},
141128
"dependencies": [
142-
"ANTLR4_COMPLETE",
129+
"truffle:ANTLR4_COMPLETE",
143130
],
144131
"native": True,
145132
"vpath": True,
@@ -162,7 +149,7 @@
162149
"dependencies": [
163150
"truffle:TRUFFLE_API",
164151
"sdk:GRAAL_SDK",
165-
"ANTLR4",
152+
"truffle:ANTLR4",
166153
"regex:TREGEX",
167154
],
168155
"buildDependencies": ["com.oracle.graal.python.parser.antlr"],
@@ -280,6 +267,7 @@
280267
"truffle:TRUFFLE_API",
281268
"regex:TREGEX",
282269
"sdk:GRAAL_SDK",
270+
"truffle:ANTLR4",
283271
],
284272
"sourcesPath": "graalpython.src.zip",
285273
},

0 commit comments

Comments
 (0)