@@ -178,14 +178,14 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
178
178
_mx(env, args): ['mx' , '--env' , env] + args,
179
179
180
180
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,
184
183
local targets_args = if std.length (targets) > 0 then ['--targets=' + std.join (',' , targets)] else [],
185
184
local extra_dynamic_imports_args = if std.length (extra_dynamic_imports) > 0 then ['--dynamicimports' , std.join (',' , extra_dynamic_imports)] else [],
186
185
run+: [
187
186
['mx' ] + extra_dynamic_imports_args + ['sversions' ],
188
187
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])],
189
189
],
190
190
},
191
191
0 commit comments