Skip to content

Commit ec320cd

Browse files
gjsjohnmurraygjsjohnmurray
authored
Merge branch 'main' into fix-200571
2 parents 9824af2 + 5da45d1 commit ec320cd

File tree

126 files changed

+1772
-931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+1772
-931
lines changed

‎.vscode/notebooks/my-work.github-issues

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
"kind": 2,
99
"language": "github-issues",
10-
"value": "// list of repos we work in\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\n\n// current milestone name\n$MILESTONE=milestone:\"November 2023\"\n"
10+
"value": "// list of repos we work in\r\n$REPOS=repo:microsoft/lsprotocol repo:microsoft/monaco-editor repo:microsoft/vscode repo:microsoft/vscode-anycode repo:microsoft/vscode-autopep8 repo:microsoft/vscode-black-formatter repo:microsoft/vscode-copilot repo:microsoft/vscode-copilot-release repo:microsoft/vscode-dev repo:microsoft/vscode-dev-chrome-launcher repo:microsoft/vscode-emmet-helper repo:microsoft/vscode-extension-telemetry repo:microsoft/vscode-flake8 repo:microsoft/vscode-github-issue-notebooks repo:microsoft/vscode-hexeditor repo:microsoft/vscode-internalbacklog repo:microsoft/vscode-isort repo:microsoft/vscode-js-debug repo:microsoft/vscode-jupyter repo:microsoft/vscode-jupyter-internal repo:microsoft/vscode-l10n repo:microsoft/vscode-livepreview repo:microsoft/vscode-markdown-languageservice repo:microsoft/vscode-markdown-tm-grammar repo:microsoft/vscode-mypy repo:microsoft/vscode-pull-request-github repo:microsoft/vscode-pylint repo:microsoft/vscode-python repo:microsoft/vscode-python-debugger repo:microsoft/vscode-python-tools-extension-template repo:microsoft/vscode-references-view repo:microsoft/vscode-remote-release repo:microsoft/vscode-remote-repositories-github repo:microsoft/vscode-remote-tunnels repo:microsoft/vscode-remotehub repo:microsoft/vscode-settings-sync-server repo:microsoft/vscode-unpkg repo:microsoft/vscode-vsce\r\n\r\n// current milestone name\r\n$MILESTONE=milestone:\"December / January 2024\"\r\n"
1111
},
1212
{
1313
"kind": 1,
@@ -17,7 +17,7 @@
1717
{
1818
"kind": 2,
1919
"language": "github-issues",
20-
"value": "$REPOS $MILESTONE assignee:@me is:open\n"
20+
"value": "$REPOS $MILESTONE assignee:@me is:open\r\n"
2121
},
2222
{
2323
"kind": 1,
@@ -32,7 +32,7 @@
3232
{
3333
"kind": 2,
3434
"language": "github-issues",
35-
"value": "$REPOS assignee:@me is:open label:bug\n"
35+
"value": "$REPOS assignee:@me is:open label:bug\r\n"
3636
},
3737
{
3838
"kind": 1,
@@ -42,7 +42,7 @@
4242
{
4343
"kind": 2,
4444
"language": "github-issues",
45-
"value": "$REPOS assignee:@me is:open label:debt,engineering\n"
45+
"value": "$REPOS assignee:@me is:open label:debt,engineering\r\n"
4646
},
4747
{
4848
"kind": 1,
@@ -52,7 +52,7 @@
5252
{
5353
"kind": 2,
5454
"language": "github-issues",
55-
"value": "$REPOS assignee:@me is:open label:perf,perf-startup,perf-bloat,freeze-slow-crash-leak\n"
55+
"value": "$REPOS assignee:@me is:open label:perf,perf-startup,perf-bloat,freeze-slow-crash-leak\r\n"
5656
},
5757
{
5858
"kind": 1,
@@ -62,12 +62,12 @@
6262
{
6363
"kind": 2,
6464
"language": "github-issues",
65-
"value": "$REPOS assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc\n"
65+
"value": "$REPOS assignee:@me is:open label:feature-request milestone:Backlog sort:reactions-+1-desc\r\n"
6666
},
6767
{
6868
"kind": 2,
6969
"language": "github-issues",
70-
"value": "$REPOS assignee:@me is:open milestone:\"Backlog Candidates\"\n"
70+
"value": "$REPOS assignee:@me is:open milestone:\"Backlog Candidates\"\r\n"
7171
},
7272
{
7373
"kind": 1,
@@ -82,7 +82,7 @@
8282
{
8383
"kind": 2,
8484
"language": "github-issues",
85-
"value": "repo:microsoft/vscode is:open assignee:@me label:triage-needed\n"
85+
"value": "repo:microsoft/vscode is:open assignee:@me label:triage-needed\r\n"
8686
},
8787
{
8888
"kind": 1,
@@ -92,7 +92,7 @@
9292
{
9393
"kind": 2,
9494
"language": "github-issues",
95-
"value": "$REPOS assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry -label:engineering\n"
95+
"value": "$REPOS assignee:@me is:open type:issue -label:bug -label:\"info-needed\" -label:feature-request -label:under-discussion -label:debt -label:plan-item -label:upstream -label:polish -label:testplan-item -label:error-telemetry -label:engineering\r\n"
9696
},
9797
{
9898
"kind": 1,
@@ -112,7 +112,7 @@
112112
{
113113
"kind": 2,
114114
"language": "github-issues",
115-
"value": "$REPOS assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed\n"
115+
"value": "$REPOS assignee:@me is:open type:issue no:milestone -label:info-needed -label:triage-needed\r\n"
116116
},
117117
{
118118
"kind": 1,
@@ -122,7 +122,7 @@
122122
{
123123
"kind": 2,
124124
"language": "github-issues",
125-
"value": "$REPOS assignee:@me is:open label:\"info-needed\"\n"
125+
"value": "$REPOS assignee:@me is:open label:\"info-needed\"\r\n"
126126
},
127127
{
128128
"kind": 1,
@@ -137,7 +137,7 @@
137137
{
138138
"kind": 2,
139139
"language": "github-issues",
140-
"value": "$REPOS author:@me is:open is:pr review:approved\n"
140+
"value": "$REPOS author:@me is:open is:pr review:approved\r\n"
141141
},
142142
{
143143
"kind": 1,
@@ -147,7 +147,7 @@
147147
{
148148
"kind": 2,
149149
"language": "github-issues",
150-
"value": "$REPOS author:@me is:open is:pr review:required\n"
150+
"value": "$REPOS author:@me is:open is:pr review:required\r\n"
151151
},
152152
{
153153
"kind": 1,
@@ -157,6 +157,6 @@
157157
{
158158
"kind": 2,
159159
"language": "github-issues",
160-
"value": "$REPOS author:@me is:open is:pr review:changes_requested\n"
160+
"value": "$REPOS author:@me is:open is:pr review:changes_requested\r\n"
161161
}
162162
]

‎CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ There are several ways in which you can contribute, beyond writing code. The goa
66

77
## Asking Questions
88

9-
Have a question? Instead of opening an issue, please ask on [Stack Overflow](https://stackoverflow.com/questions/tagged/vscode) using the tag `vscode`.
9+
10+
Have a question? Instead of opening an issue, please ask on [Stack Overflow](https://stackoverflow.com/questions/tagged/visual-studio-code) using the tag `visual-studio-code`.
1011

1112
The active community will be eager to assist you. Your well-worded question will serve as a resource to others searching for help.
1213

‎build/.cachesalt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2023-09-06T09:54:45.225Z
1+
2023-12-07T16:21:36.646Z

‎build/azure-pipelines/cli/cli-compile-and-publish.yml

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,45 @@ steps:
3838
${{ pair.key }}: ${{ pair.value }}
3939

4040
- ${{ else }}:
41-
- script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code
42-
displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }}
43-
workingDirectory: $(Build.SourcesDirectory)/cli
44-
env:
45-
CARGO_NET_GIT_FETCH_WITH_CLI: true
46-
VSCODE_CLI_COMMIT: $(Build.SourceVersion)
47-
${{ each pair in parameters.VSCODE_CLI_ENV }}:
48-
${{ pair.key }}: ${{ pair.value }}
41+
- ${{ if contains(parameters.VSCODE_CLI_TARGET, '-linux-') }}:
42+
- script: |
43+
set -e
44+
if [ -n "$SYSROOT_ARCH" ]; then
45+
export VSCODE_SYSROOT_DIR=$(Build.SourcesDirectory)/.build/sysroots
46+
node -e '(async () => { const { getVSCodeSysroot } = require("../build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
47+
if [ "$SYSROOT_ARCH" == "arm64" ]; then
48+
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc"
49+
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
50+
export CC_aarch64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc --sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
51+
elif [ "$SYSROOT_ARCH" == "amd64" ]; then
52+
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc"
53+
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -C link-arg=-L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu"
54+
export CC_x86_64_unknown_linux_gnu="$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
55+
elif [ "$SYSROOT_ARCH" == "armhf" ]; then
56+
export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc"
57+
export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUSTFLAGS="-C link-arg=--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
58+
export CC_armv7_unknown_linux_gnueabihf="$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc --sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
59+
fi
60+
fi
61+
cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code
62+
displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }}
63+
workingDirectory: $(Build.SourcesDirectory)/cli
64+
env:
65+
CARGO_NET_GIT_FETCH_WITH_CLI: true
66+
VSCODE_CLI_COMMIT: $(Build.SourceVersion)
67+
GITHUB_TOKEN: "$(github-distro-mixin-password)"
68+
${{ each pair in parameters.VSCODE_CLI_ENV }}:
69+
${{ pair.key }}: ${{ pair.value }}
70+
71+
- ${{ else }}:
72+
- script: cargo build --release --target ${{ parameters.VSCODE_CLI_TARGET }} --bin=code
73+
displayName: Compile ${{ parameters.VSCODE_CLI_TARGET }}
74+
workingDirectory: $(Build.SourcesDirectory)/cli
75+
env:
76+
CARGO_NET_GIT_FETCH_WITH_CLI: true
77+
VSCODE_CLI_COMMIT: $(Build.SourceVersion)
78+
${{ each pair in parameters.VSCODE_CLI_ENV }}:
79+
${{ pair.key }}: ${{ pair.value }}
4980

5081
- ${{ if contains(parameters.VSCODE_CLI_TARGET, '-windows-') }}:
5182
- powershell: |

‎build/azure-pipelines/linux/cli-build-linux.yml

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,45 @@ steps:
3939
tar -xvzf $(Build.ArtifactStagingDirectory)/vscode-internal-openssl-prebuilt-0.0.11.tgz --strip-components=1 --directory=$(Build.ArtifactStagingDirectory)/openssl
4040
displayName: Extract openssl prebuilt
4141
42-
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
43-
- bash: sudo apt-get install -yq gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
44-
displayName: Install arm32 toolchains
42+
- ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}:
43+
- script: node build/setup-npm-registry.js $NPM_REGISTRY
44+
condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
45+
displayName: Setup NPM Registry
4546

46-
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARM64, true) }}:
47-
- bash: sudo apt-get install -yq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
48-
displayName: Install arm64 toolchains
47+
- script: |
48+
set -e
49+
npm config set registry "$NPM_REGISTRY" --location=project
50+
# npm >v7 deprecated the `always-auth` config option, refs npm/cli@72a7eeb
51+
# following is a workaround for yarn to send authorization header
52+
# for GET requests to the registry.
53+
echo "always-auth=true" >> .npmrc
54+
yarn config set registry "$NPM_REGISTRY"
55+
condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
56+
displayName: Setup NPM & Yarn
57+
58+
- task: npmAuthenticate@0
59+
inputs:
60+
workingFile: .npmrc
61+
condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none'))
62+
displayName: Setup NPM Authentication
63+
64+
- script: |
65+
set -e
66+
67+
for i in {1..5}; do # try 5 times
68+
yarn --cwd build --frozen-lockfile --check-files && break
69+
if [ $i -eq 3 ]; then
70+
echo "Yarn failed too many times" >&2
71+
exit 1
72+
fi
73+
echo "Yarn failed $i, trying again..."
74+
done
75+
displayName: Install build dependencies
76+
77+
- script: |
78+
set -e
79+
mkdir -p $(Build.SourcesDirectory)/.build
80+
displayName: Create .build folder for misc dependencies
4981
5082
- template: ../cli/install-rust-posix.yml
5183
parameters:
@@ -65,9 +97,9 @@ steps:
6597
VSCODE_CLI_ARTIFACT: vscode_cli_linux_arm64_cli
6698
VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }}
6799
VSCODE_CLI_ENV:
68-
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
69100
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/lib
70101
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm64-linux/include
102+
SYSROOT_ARCH: arm64
71103

72104
- ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
73105
- template: ../cli/cli-compile-and-publish.yml
@@ -79,6 +111,7 @@ steps:
79111
VSCODE_CLI_ENV:
80112
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/lib
81113
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/x64-linux/include
114+
SYSROOT_ARCH: amd64
82115

83116
- ${{ if eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true) }}:
84117
- template: ../cli/cli-compile-and-publish.yml
@@ -88,6 +121,6 @@ steps:
88121
VSCODE_CLI_ARTIFACT: vscode_cli_linux_armhf_cli
89122
VSCODE_CHECK_ONLY: ${{ parameters.VSCODE_CHECK_ONLY }}
90123
VSCODE_CLI_ENV:
91-
CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
92124
OPENSSL_LIB_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm-linux/lib
93125
OPENSSL_INCLUDE_DIR: $(Build.ArtifactStagingDirectory)/openssl/arm-linux/include
126+
SYSROOT_ARCH: armhf

‎build/azure-pipelines/linux/install.sh

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@ set -e
55
# To workaround the issue of yarn not respecting the registry value from .npmrc
66
yarn config set registry "$NPM_REGISTRY"
77

8-
if [ -z "$CC" ] || [ -z "$CXX" ]; then
8+
SYSROOT_ARCH=$VSCODE_ARCH
9+
if [ "$SYSROOT_ARCH" == "x64" ]; then
10+
SYSROOT_ARCH="amd64"
11+
fi
12+
13+
export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
14+
SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
15+
16+
if [ "$npm_config_arch" == "x64" ]; then
917
# Download clang based on chromium revision used by vscode
1018
curl -s https://raw.githubusercontent.com/chromium/chromium/118.0.5993.159/tools/clang/scripts/update.py | python - --output-dir=$PWD/.build/CR_Clang --host-os=linux
1119

@@ -22,12 +30,27 @@ if [ -z "$CC" ] || [ -z "$CXX" ]; then
2230
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/arm.gni
2331
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/compiler/BUILD.gn
2432
# https://source.chromium.org/chromium/chromium/src/+/refs/tags/118.0.5993.159:build/config/c++/BUILD.gn
25-
export CC=$PWD/.build/CR_Clang/bin/clang
26-
export CXX=$PWD/.build/CR_Clang/bin/clang++
27-
export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr"
28-
export LDFLAGS="-stdlib=libc++ -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -Wl,--lto-O0"
29-
export VSCODE_REMOTE_CC=$(which gcc)
30-
export VSCODE_REMOTE_CXX=$(which g++)
33+
export CC="$PWD/.build/CR_Clang/bin/clang --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
34+
export CXX="$PWD/.build/CR_Clang/bin/clang++ --gcc-toolchain=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu"
35+
export CXXFLAGS="-nostdinc++ -D__NO_INLINE__ -I$PWD/.build/libcxx_headers -isystem$PWD/.build/libcxx_headers/include -isystem$PWD/.build/libcxxabi_headers/include -fPIC -flto=thin -fsplit-lto-unit -D_LIBCPP_ABI_NAMESPACE=Cr --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
36+
export LDFLAGS="-stdlib=libc++ --sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -fuse-ld=lld -flto=thin -L$PWD/.build/libcxx-objects -lc++abi -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu -Wl,--lto-O0"
37+
# Set compiler toolchain for remote server
38+
export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-gcc
39+
export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++
40+
export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
41+
export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu"
42+
elif [ "$npm_config_arch" == "arm64" ]; then
43+
# Set compiler toolchain for client native modules and remote server
44+
export CC=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc
45+
export CXX=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/bin/aarch64-linux-gnu-g++
46+
export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot"
47+
export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/usr/lib/aarch64-linux-gnu -L$VSCODE_SYSROOT_DIR/aarch64-linux-gnu/aarch64-linux-gnu/sysroot/lib/aarch64-linux-gnu"
48+
elif [ "$npm_config_arch" == "arm" ]; then
49+
# Set compiler toolchain for client native modules and remote server
50+
export CC=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-gcc
51+
export CXX=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf-g++
52+
export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
53+
export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
3154
fi
3255

3356
for i in {1..5}; do # try 5 times

0 commit comments

Comments
 (0)