Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve hints when user specify custom wasm-pack-rustflags but does not contain default one #2122

Merged
merged 2 commits into from
Jun 20, 2024
Merged

Improve hints when user specify custom wasm-pack-rustflags but does not contain default one #2122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c21411c
feat: msg
fzyzcjy Jun 20, 2024
93b668c
Merge branch 'master' into feat/12365
fzyzcjy Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions frb_dart/lib/src/cli/build_web/executor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,21 @@ Future<void> _executeWasmPack(BuildWebArgs args,
// if (config.cliOpts.features != null) '--features=${config.cliOpts.features}'
], env: {
'RUSTUP_TOOLCHAIN': args.wasmPackRustupToolchain ?? 'nightly',
'RUSTFLAGS': args.wasmPackRustflags ??
'-C target-feature=+atomics,+bulk-memory,+mutable-globals',
'RUSTFLAGS': _computeRustflags(argsOverride: args.wasmPackRustflags),
if (stdout.supportsAnsiEscapes) 'CARGO_TERM_COLOR': 'always',
});
}

String _computeRustflags({required String? argsOverride}) {
const kDefault = '-C target-feature=+atomics,+bulk-memory,+mutable-globals';
if (argsOverride == null) return kDefault;
if (!argsOverride.contains(kDefault)) {
print(
'WARN: RUSTFLAGS will be `$argsOverride`, which does not contain the default one `$kDefault`');
}
return argsOverride;
}

Future<void> _executeWasmBindgen(BuildWebArgs args,
{required String rustCrateName}) async {
await runCommand('wasm-bindgen', [
Expand Down
Loading