Skip to content

Commit bcd6c9e

Browse files
committed
Suppress incorrect warnings on Mac M1 (#8757)
1 parent 6f62c61 commit bcd6c9e

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Extension/src/main.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,18 @@ async function makeBinariesExecutable(): Promise<void> {
107107
commonBinaries.forEach(binary => promises.push(util.allowExecution(util.getExtensionFilePath(binary))));
108108
if (process.platform === "darwin") {
109109
const macBinaries: string[] = [
110-
"./debugAdapters/lldb-mi/bin/lldb-mi",
111-
"./debugAdapters/lldb/bin/debugserver",
112-
"./debugAdapters/lldb/bin/lldb-mi",
113-
"./debugAdapters/lldb/bin/lldb-argdumper",
114-
"./debugAdapters/lldb/bin/lldb-launcher"
110+
"./debugAdapters/lldb-mi/bin/lldb-mi"
115111
];
116112
macBinaries.forEach(binary => promises.push(util.allowExecution(util.getExtensionFilePath(binary))));
113+
if (os.arch() === "x64") {
114+
const oldMacBinaries: string[] = [
115+
"./debugAdapters/lldb/bin/debugserver",
116+
"./debugAdapters/lldb/bin/lldb-mi",
117+
"./debugAdapters/lldb/bin/lldb-argdumper",
118+
"./debugAdapters/lldb/bin/lldb-launcher"
119+
];
120+
oldMacBinaries.forEach(binary => promises.push(util.allowExecution(util.getExtensionFilePath(binary))));
121+
}
117122
}
118123
}
119124
await Promise.all(promises);

Extension/src/platform.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,14 @@ export class PlatformInformation {
4949
public static GetArchitecture(): string {
5050
const arch: string = os.arch();
5151
switch (arch) {
52-
case "x64":
5352
case "arm64":
5453
case "arm":
5554
return arch;
5655
case "x32":
5756
case "ia32":
5857
return "x86";
5958
default:
60-
if (os.platform() === "win32") {
61-
return "x86";
62-
} else {
63-
return "x64";
64-
}
59+
return "x64";
6560
}
6661
}
6762

0 commit comments

Comments
 (0)