Merge pull request #2122 from fzyzcjy/feat/12365

fzyzcjy · Jun 20, 2024 · d699cdb · d699cdb
2 parents 99c2738 + 93b668c
commit d699cdb
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/frb_dart/lib/src/cli/build_web/executor.dart b/frb_dart/lib/src/cli/build_web/executor.dart
@@ -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', [