naskya/napi-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1025 from napi-rs/support-zig-abi-flag

Browse source 
fix(cli): missing zig-abi-suffix support
This commit is contained in:
LongYinan 2022-01-13 14:39:41 +08:00 committed by GitHub
commit ee3e68adec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cli/src/build.ts
View file

@ -154,6 +154,14 @@ export class BuildCommand extends Command {
)}`, )}`,
}) })
zigABIVersion = Option.String(`--zig-abi-suffix`, {
description: `The suffix of the ${chalk.green(
'zig --target',
)} ABI version. Eg. ${chalk.cyan(
'--target x86_64-unknown-linux-gnu',
)} ${chalk.green('--zig-abi-suffix=2.17')}`,
})
async execute() { async execute() {
const cwd = this.cargoCwd const cwd = this.cargoCwd
? join(process.cwd(), this.cargoCwd) ? join(process.cwd(), this.cargoCwd)
@ -208,7 +216,9 @@ export class BuildCommand extends Command {
} }
if (this.useZig) { if (this.useZig) {
const zigTarget = ZIG_PLATFORM_TARGET_MAP[triple.raw] const zigTarget = `${ZIG_PLATFORM_TARGET_MAP[triple.raw]}${
this.zigABIVersion ? `.${this.zigABIVersion}` : ''
}`
if (!zigTarget) { if (!zigTarget) {
throw new Error(`${triple.raw} can not be cross compiled by zig`) throw new Error(`${triple.raw} can not be cross compiled by zig`)
} }