exe

irondash · Sep 12, 2023 · 393b9b2 · 393b9b2
1 parent c8ecbc9
commit 393b9b2
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/build_tool/lib/src/android_environment.dart b/build_tool/lib/src/android_environment.dart
@@ -96,6 +96,8 @@ class AndroidEnvironment {
     final minSdkVersion =
         math.max(target.androidMinSdkVersion!, this.minSdkVersion);
 
+    final exe = Platform.isWindows ? '.exe' : '';
+
     final arKey = 'AR_${target.rust}';
     final arValue = ['${target.rust}-ar', 'llvm-ar', 'llvm-ar.exe']
         .map((e) => path.join(toolchainPath, e))
@@ -107,26 +109,27 @@ class AndroidEnvironment {
     final targetArg = '--target=${target.rust}$minSdkVersion';
 
     final ccKey = 'CC_${target.rust}';
-    final ccValue = path.join(toolchainPath, 'clang');
+    final ccValue = path.join(toolchainPath, 'clang$exe');
     final cfFlagsKey = 'CFLAGS_${target.rust}';
     final cFlagsValue = targetArg;
 
     final ccFile = File(ccValue);
     if (!ccFile.existsSync()) {
-      throw Exception('Failed to find cc for $target in $toolchainPath: $ccValue');
+      throw Exception(
+          'Failed to find cc for $target in $toolchainPath: $ccValue');
     }
     print('CC exists at ${ccValue}');
 
     final cxxKey = 'CXX_${target.rust}';
-    final cxxValue = path.join(toolchainPath, 'clang++');
+    final cxxValue = path.join(toolchainPath, 'clang++$exe');
     final cxxfFlagsKey = 'CXXFLAGS_${target.rust}';
     final cxxFlagsValue = targetArg;
 
     final linkerKey =
         'cargo_target_${target.rust.replaceAll('-', '_')}_linker'.toUpperCase();
 
     final ranlibKey = 'RANLIB_${target.rust}';
-    final ranlibValue = path.join(toolchainPath, 'llvm-ranlib');
+    final ranlibValue = path.join(toolchainPath, 'llvm-ranlib$exe');
 
     final ndkVersionParsed = Version.parse(ndkVersion);
     final rustFlagsKey = 'CARGO_ENCODED_RUSTFLAGS';