Skip to content

Commit e730c89

Browse files
committed
[GR-58613] Make mx native-image build output go through mx logging infrastructure.
PullRequest: graal/19270
2 parents 137fd0b + 33a532c commit e730c89

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.35.2",
7+
"mx_version": "7.36.0",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

sdk/mx.sdk/mx_sdk_vm_impl.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,8 +1238,8 @@ def native_image(self, build_args, output_file, out=None, err=None):
12381238
])
12391239

12401240
# Prefix native-image builds that print straight to stdout or stderr with [<output_filename>:<pid>]
1241-
out = out or mx.PrefixCapture(sys.stdout.write, basename(output_file))
1242-
err = err or mx.PrefixCapture(sys.stderr.write, basename(output_file))
1241+
out = out or mx.PrefixCapture(lambda l: mx.log(l, end=''), basename(output_file))
1242+
err = err or mx.PrefixCapture(lambda l: mx.log(l, end='', file=sys.stderr), basename(output_file))
12431243

12441244
mx.run(native_image_command, nonZeroIsFatal=True, out=out, err=err)
12451245

sdk/mx.sdk/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# SOFTWARE.
4040
#
4141
suite = {
42-
"mxversion": "7.33.1",
42+
"mxversion": "7.36.0",
4343
"name" : "sdk",
4444
"version" : "24.2.0",
4545
"release" : False,

0 commit comments

Comments
 (0)