Skip to content

Commit ff8814a

Browse files
[GR-65107] Set ESPRESSO_HOME in build_espresso
PullRequest: graal/20847
2 parents 30f7f04 + 8a7d1cd commit ff8814a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

espresso/ci/ci_common/common.jsonnet

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,14 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
178178
_mx(env, args): ['mx', '--env', env] + args,
179179

180180
build_espresso(env, debug=false, extra_mx_args=[], default_env_traget=true, extra_targets=[], extra_dynamic_imports=[]): {
181-
local targets = (if default_env_traget then (
182-
if std.startsWith(env, 'jvm') then ['ESPRESSO_JVM_STANDALONE'] else ['ESPRESSO_NATIVE_STANDALONE']
183-
) else []) + extra_targets,
181+
local standalone = if std.startsWith(env, 'jvm') then 'ESPRESSO_JVM_STANDALONE' else 'ESPRESSO_NATIVE_STANDALONE',
182+
local targets = (if default_env_traget then [standalone] else []) + extra_targets,
184183
local targets_args = if std.length(targets) > 0 then ['--targets=' + std.join(',', targets)] else [],
185184
local extra_dynamic_imports_args = if std.length(extra_dynamic_imports) > 0 then ['--dynamicimports', std.join(',', extra_dynamic_imports)] else [],
186185
run+: [
187186
['mx'] + extra_dynamic_imports_args + ['sversions'],
188187
that._mx(env, (if debug then ['--debug-images'] else []) + extra_mx_args + extra_dynamic_imports_args + ['build'] + targets_args),
188+
['set-export', 'ESPRESSO_HOME', that._mx(env, ['--quiet', '--no-warning'] + extra_mx_args + extra_dynamic_imports_args + ['path', '--output', standalone])],
189189
],
190190
},
191191

0 commit comments

Comments
 (0)