@@ -167,6 +167,8 @@ export function getTargetEnvironmentVariables({
167
167
const targetArch = getTargetAndroidArch ( target ) ;
168
168
const targetPlatform = getTargetAndroidPlatform ( target ) ;
169
169
const weakNodeApiPath = getWeakNodeApiAndroidLibraryPath ( target ) ;
170
+ const cmdMaybe = process . platform === "win32" ? ".cmd" : "" ;
171
+ const exeMaybe = process . platform === "win32" ? ".exe" : "" ;
170
172
171
173
return {
172
174
CARGO_ENCODED_RUSTFLAGS : [
@@ -177,32 +179,32 @@ export function getTargetEnvironmentVariables({
177
179
] . join ( String . fromCharCode ( 0x1f ) ) ,
178
180
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER : joinPathAndAssertExistence (
179
181
toolchainBinPath ,
180
- `aarch64-linux-android${ androidApiLevel } -clang`
182
+ `aarch64-linux-android${ androidApiLevel } -clang${ cmdMaybe } `
181
183
) ,
182
184
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER : joinPathAndAssertExistence (
183
185
toolchainBinPath ,
184
- `armv7a-linux-androideabi${ androidApiLevel } -clang`
186
+ `armv7a-linux-androideabi${ androidApiLevel } -clang${ cmdMaybe } `
185
187
) ,
186
188
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER : joinPathAndAssertExistence (
187
189
toolchainBinPath ,
188
- `x86_64-linux-android${ androidApiLevel } -clang`
190
+ `x86_64-linux-android${ androidApiLevel } -clang${ cmdMaybe } `
189
191
) ,
190
192
CARGO_TARGET_I686_LINUX_ANDROID_LINKER : joinPathAndAssertExistence (
191
193
toolchainBinPath ,
192
- `i686-linux-android${ androidApiLevel } -clang`
194
+ `i686-linux-android${ androidApiLevel } -clang${ cmdMaybe } `
193
195
) ,
194
196
TARGET_CC : joinPathAndAssertExistence (
195
197
toolchainBinPath ,
196
- `${ targetArch } -linux-${ targetPlatform } -clang`
198
+ `${ targetArch } -linux-${ targetPlatform } -clang${ cmdMaybe } `
197
199
) ,
198
200
TARGET_CXX : joinPathAndAssertExistence (
199
201
toolchainBinPath ,
200
- `${ targetArch } -linux-${ targetPlatform } -clang++`
202
+ `${ targetArch } -linux-${ targetPlatform } -clang++${ cmdMaybe } `
201
203
) ,
202
- TARGET_AR : joinPathAndAssertExistence ( toolchainBinPath , `llvm-ar` ) ,
204
+ TARGET_AR : joinPathAndAssertExistence ( toolchainBinPath , `llvm-ar${ exeMaybe } ` ) ,
203
205
TARGET_RANLIB : joinPathAndAssertExistence (
204
206
toolchainBinPath ,
205
- `llvm-ranlib`
207
+ `llvm-ranlib${ exeMaybe } `
206
208
) ,
207
209
ANDROID_NDK : ndkPath ,
208
210
PATH : `${ toolchainBinPath } :${ process . env . PATH } ` ,
0 commit comments