[native_toolchain_c] Fix MSVC x86 toolchain resolution (#124)

dart-lang · Sep 11, 2023 · 9f24b64 · 9f24b64
1 parent 07e1de5
commit 9f24b64
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pkgs/native_toolchain_c/CHANGELOG.md b/pkgs/native_toolchain_c/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.3
+
+- Fix MSVC tool resolution inside (x86) folder
+  ([#123](https://github.com/dart-lang/native/issues/123)).
+
 ## 0.2.2
 
 - Generate position independent code for libraries by default and add

diff --git a/pkgs/native_toolchain_c/lib/src/native_toolchain/msvc.dart b/pkgs/native_toolchain_c/lib/src/native_toolchain/msvc.dart
@@ -4,6 +4,7 @@
 
 import 'dart:io';
 
+import 'package:glob/glob.dart';
 import 'package:logging/logging.dart';
 import 'package:native_assets_cli/native_assets_cli.dart';
 
@@ -71,7 +72,7 @@ Tool vcvars(ToolInstance toolInstance) {
     defaultResolver: InstallLocationResolver(
       toolName: fileName,
       paths: [
-        batchScript.toFilePath().replaceAll('\\', '/'),
+        Glob.quote(batchScript.toFilePath().replaceAll('\\', '/')),
       ],
     ),
   );

diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml
@@ -1,7 +1,7 @@
 name: native_toolchain_c
 description: >-
   A library to invoke the native C compiler installed on the host machine.
-version: 0.2.2
+version: 0.2.3
 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c
 
 topics: