fix(native): inspect the selected universal Mach-O architecture (#601)

Signed-off-by: Rudy Celekli <47457359+rudycelekli@users.noreply.github.com>
This commit is contained in:
Rudy Mizrahi Celekli
2026-10-06 02:08:33 +08:00
committed by GitHub
parent 1b6f05470d
commit 2b7bb3bb6a
2 changed files with 70 additions and 2 deletions
+28 -2
View File
@@ -54,7 +54,11 @@ export const inspectNativeMacho = async (
for (const [tool, prefix] of REQUIRED_COMMANDS) {
const captured = await context.run(
tool,
[...prefix, context.target.path],
[
...prefix,
...selectedArchitectureArguments(tool, context.target),
context.target.path,
],
context.signal,
);
if (!captured.ok) return err(captured.error);
@@ -64,7 +68,11 @@ export const inspectNativeMacho = async (
const [tool, prefix] = OPTIONAL_VTOOL_COMMAND;
const optional = await context.run(
tool,
[...prefix, context.target.path],
[
...prefix,
...selectedArchitectureArguments(tool, context.target),
context.target.path,
],
context.signal,
);
if (optional.ok) captures.push(optional.value);
@@ -251,3 +259,21 @@ export const architectureLocations = (
}
return locations;
};
const selectedArchitectureArguments = (
tool: string,
target: BinaryTarget,
): string[] => {
if (
target.kind !== "executable" ||
target.availableArchitectures.length < 2 ||
tool === "file" ||
tool === "lipo"
)
return [];
const architecture =
target.architecture === "x86" ? "i386" : target.architecture;
return tool === "dwarfdump"
? [`--arch=${architecture}`]
: ["-arch", architecture];
};