From 14aab065e7e7f3fe927d1dbb72bce8a8d419b711 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Fri, 12 Aug 2022 16:52:05 +0800 Subject: [PATCH 1/2] fix(cli): zig cross to *-apple-darwin target --- cli/src/build.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cli/src/build.ts b/cli/src/build.ts index 48861d6e..04adabfe 100644 --- a/cli/src/build.ts +++ b/cli/src/build.ts @@ -40,10 +40,13 @@ const ZIG_PLATFORM_TARGET_MAP = { function processZigLinkerArgs(platform: string, args: string[]) { if (platform.includes('apple')) { const newArgs = args.filter( - (arg) => + (arg, index) => !arg.startsWith('-Wl,-exported_symbols_list') && arg !== '-Wl,-dylib' && - arg !== '-liconv', + arg !== '-liconv' && + arg !== '-Wl,-dead_strip' && + !(arg === '-framework' && args[index + 1] === 'CoreFoundation') && + !(arg === 'CoreFoundation' && args[index - 1] === '-framework'), ) newArgs.push('-Wl,"-undefined=dynamic_lookup"', '-dead_strip') return newArgs From d9f52454321aa825d32fdadf6f87a7d2f482d515 Mon Sep 17 00:00:00 2001 From: LongYinan Date: Fri, 12 Aug 2022 16:56:45 +0800 Subject: [PATCH 2/2] ci: fix FreeBSD check CI --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 13bfe9a9..51fd93e5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,7 @@ task: - pkg update - pkg install -y -f curl node16 libnghttp2 - curl -qL https://www.npmjs.com/install.sh | sh - - npm install -g yarn + - npm install --location=global --ignore-scripts yarn - curl https://sh.rustup.rs -sSf --output rustup.sh - sh rustup.sh -y --profile minimal --default-toolchain stable - |