Skip to content

Commit 48ac294

Browse files
authored
Fix executible extensions for NDK access from ferric (#135)
1 parent ea0b560 commit 48ac294

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

packages/ferric/src/cargo.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ export function getTargetEnvironmentVariables({
167167
const targetArch = getTargetAndroidArch(target);
168168
const targetPlatform = getTargetAndroidPlatform(target);
169169
const weakNodeApiPath = getWeakNodeApiAndroidLibraryPath(target);
170+
const cmdMaybe = process.platform === "win32" ? ".cmd" : "";
171+
const exeMaybe = process.platform === "win32" ? ".exe" : "";
170172

171173
return {
172174
CARGO_ENCODED_RUSTFLAGS: [
@@ -177,32 +179,32 @@ export function getTargetEnvironmentVariables({
177179
].join(String.fromCharCode(0x1f)),
178180
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER: joinPathAndAssertExistence(
179181
toolchainBinPath,
180-
`aarch64-linux-android${androidApiLevel}-clang`
182+
`aarch64-linux-android${androidApiLevel}-clang${cmdMaybe}`
181183
),
182184
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER: joinPathAndAssertExistence(
183185
toolchainBinPath,
184-
`armv7a-linux-androideabi${androidApiLevel}-clang`
186+
`armv7a-linux-androideabi${androidApiLevel}-clang${cmdMaybe}`
185187
),
186188
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER: joinPathAndAssertExistence(
187189
toolchainBinPath,
188-
`x86_64-linux-android${androidApiLevel}-clang`
190+
`x86_64-linux-android${androidApiLevel}-clang${cmdMaybe}`
189191
),
190192
CARGO_TARGET_I686_LINUX_ANDROID_LINKER: joinPathAndAssertExistence(
191193
toolchainBinPath,
192-
`i686-linux-android${androidApiLevel}-clang`
194+
`i686-linux-android${androidApiLevel}-clang${cmdMaybe}`
193195
),
194196
TARGET_CC: joinPathAndAssertExistence(
195197
toolchainBinPath,
196-
`${targetArch}-linux-${targetPlatform}-clang`
198+
`${targetArch}-linux-${targetPlatform}-clang${cmdMaybe}`
197199
),
198200
TARGET_CXX: joinPathAndAssertExistence(
199201
toolchainBinPath,
200-
`${targetArch}-linux-${targetPlatform}-clang++`
202+
`${targetArch}-linux-${targetPlatform}-clang++${cmdMaybe}`
201203
),
202-
TARGET_AR: joinPathAndAssertExistence(toolchainBinPath, `llvm-ar`),
204+
TARGET_AR: joinPathAndAssertExistence(toolchainBinPath, `llvm-ar${exeMaybe}`),
203205
TARGET_RANLIB: joinPathAndAssertExistence(
204206
toolchainBinPath,
205-
`llvm-ranlib`
207+
`llvm-ranlib${exeMaybe}`
206208
),
207209
ANDROID_NDK: ndkPath,
208210
PATH: `${toolchainBinPath}:${process.env.PATH}`,

0 commit comments

Comments
 (0)