Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,12 @@ export function compile(
// Homebrew's clang can't find lld by short name on macOS CI runners.
// Try ld.lld first (ELF-specific), fall back to lld (multicall binary, auto-detects format).
const crossLinker = crossCompiling ? ` -fuse-ld=${findLLD()}` : "";
const suppressLdWarnings = targetIsMac ? " -Wl,-w" : "";
// User-provided linker flags (--link-obj, --link-lib, --link-path)
const userObjs = extraLinkObjs.length > 0 ? " " + extraLinkObjs.join(" ") : "";
const userPaths = extraLinkPaths.map((p) => ` -L${p}`).join("");
const userLibs = extraLinkLibs.map((l) => ` -l${l}`).join("");
const linkCmd = `${linker} ${objFile} ${lwsBridgeObj} ${regexBridgeObj} ${cpBridgeObj} ${osBridgeObj} ${timeBridgeObj} ${base64BridgeObj} ${urlBridgeObj} ${uriBridgeObj} ${dotenvBridgeObj} ${watchBridgeObj} ${cpSpawnObj}${extraObjs}${userObjs} -o ${outputFile}${noPie}${debugFlag}${stripFlag}${staticFlag}${crossTarget}${crossLinker}${sanitizeFlags} ${linkLibs}${userPaths}${userLibs}`;
const linkCmd = `${linker} ${objFile} ${lwsBridgeObj} ${regexBridgeObj} ${cpBridgeObj} ${osBridgeObj} ${timeBridgeObj} ${base64BridgeObj} ${urlBridgeObj} ${uriBridgeObj} ${dotenvBridgeObj} ${watchBridgeObj} ${cpSpawnObj}${extraObjs}${userObjs} -o ${outputFile}${noPie}${debugFlag}${stripFlag}${staticFlag}${crossTarget}${crossLinker}${suppressLdWarnings}${sanitizeFlags} ${linkLibs}${userPaths}${userLibs}`;
logger.info(` ${linkCmd}`);
const linkStdio = logger.getLevel() >= LogLevel.Verbose ? "inherit" : "pipe";
execSync(linkCmd, { stdio: linkStdio });
Expand Down
2 changes: 2 additions & 0 deletions src/native-compiler-lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ export function compileNative(inputFile: string, outputFile: string): void {
// Use full path because Homebrew clang can't find lld by short name.
// Try ld.lld first (ELF-specific), fall back to lld (multicall binary, auto-detects format).
const crossLinker = crossCompiling ? " -fuse-ld=" + findLLD() : "";
const suppressLdWarnings = isMac ? " -Wl,-w" : "";

// User-provided linker flags (--link-obj, --link-lib, --link-path)
let userLinkObjs = "";
Expand Down Expand Up @@ -608,6 +609,7 @@ export function compileNative(inputFile: string, outputFile: string): void {
staticFlag +
crossTargetFlag +
crossLinker +
suppressLdWarnings +
" " +
linkLibs +
userLinkFlags;
Expand Down
Loading