Skip to content

Remove some 32-bit Linux stuff. #5357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sean-mcmanus merged 1 commit into from
Apr 24, 2020
Merged

Remove some 32-bit Linux stuff. #5357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 0 additions & 46 deletions Extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,22 +1575,6 @@
"./bin/cpptools-srv"
]
},
{
"description": "C/C++ language components (Linux / x86)",
"url": "https://go.microsoft.com/fwlink/?linkid=2125145",
"platforms": [
"linux"
],
"architectures": [
"x86",
"i686",
"i386"
],
"binaries": [
"./bin/cpptools",
"./bin/cpptools-srv"
]
},
{
"description": "C/C++ language components (OS X)",
"url": "https://go.microsoft.com/fwlink/?linkid=2125057",
Expand Down Expand Up @@ -1623,21 +1607,6 @@
"./LLVM/bin/clang-format"
]
},
{
"description": "ClangFormat (Linux / x86)",
"url": "https://go.microsoft.com/fwlink/?LinkID=2117145",
"platforms": [
"linux"
],
"architectures": [
"x86",
"i686",
"i386"
],
"binaries": [
"./LLVM/bin/clang-format"
]
},
{
"description": "ClangFormat (OS X)",
"url": "https://go.microsoft.com/fwlink/?LinkID=2117146",
Expand Down Expand Up @@ -1665,21 +1634,6 @@
],
"binaries": []
},
{
"description": "Mono Runtime (Linux / x86)",
"url": "https://go.microsoft.com/fwlink/?LinkId=2027410",
"platforms": [
"linux"
],
"architectures": [
"x86",
"i686",
"i386"
],
"binaries": [
"./debugAdapters/mono.linux-x86"
]
},
{
"description": "Mono Runtime (Linux / x86_64)",
"url": "https://go.microsoft.com/fwlink/?LinkId=2027416",
Expand Down
4 changes: 1 addition & 3 deletions Extension/src/githubAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ function vsixNameForPlatform(info: PlatformInformation): string {
default: {
switch (platformInfo.architecture) {
case 'x86_64': return 'cpptools-linux.vsix';
case 'x86':
case 'i386':
case 'i686': return 'cpptools-linux32.vsix';
default: throw new Error(`Unexpected Linux architecture: ${platformInfo.architecture}`);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Extension/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ let disposables: vscode.Disposable[] = [];

export async function activate(context: vscode.ExtensionContext): Promise<CppToolsApi & CppToolsExtension> {
let errMsg: string = "";
if (process.arch !== 'ia32' && process.arch !== 'x64') {
if (process.arch !== 'x64' && (process.platform !== 'win32' || process.arch !== 'ia32')) {
errMsg = localize("architecture.not.supported", "Architecture {0} is not supported. ", String(process.arch));
} else if (process.platform === 'linux' && fs.existsSync('/etc/alpine-release')) {
errMsg = localize("apline.containers.not.supported", "Alpine containers are not supported.");
Expand Down