From 914f0da189eb4167ca6dacae83bbc12ce79037b3 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 18 Aug 2025 14:49:58 +0200
Subject: [PATCH] chore(linux-reh-x86): streamline to only necessary* changes
 (#2471)

---
 .github/workflows/insider-linux.yml      | 19 ++++++++++---------
 build/linux/package_reh.sh               |  2 +-
 build/linux/verify_cxx11_requirements.sh |  2 +-
 patches/linux/arch-0-support.patch       |  5 -----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
index cda0e76..ca80fb7 100644
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@@ -331,16 +331,17 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-        if: env.DISABLED != 'yes' && matrix.npm_arch != 'x64'
+        if: env.DISABLED != 'yes'
+        # if: env.DISABLED != 'yes' && matrix.npm_arch != 'x64'
 
-      - name: Install unofficial Node.js
-        run: ./build/linux/install_nodejs.sh
-        env:
-          NODEJS_ARCH: ${{ matrix.npm_arch }}
-          NODEJS_SITE: https://unofficial-builds.nodejs.org
-          NODEJS_URLROOT: /download/release
-          NODEJS_URLSUFFIX: -glibc-217
-        if: env.DISABLED != 'yes' && matrix.npm_arch == 'x64'
+      # - name: Install unofficial Node.js
+      #   run: ./build/linux/install_nodejs.sh
+      #   env:
+      #     NODEJS_ARCH: ${{ matrix.npm_arch }}
+      #     NODEJS_SITE: https://unofficial-builds.nodejs.org
+      #     NODEJS_URLROOT: /download/release
+      #     NODEJS_URLSUFFIX: -glibc-217
+      #   if: env.DISABLED != 'yes' && matrix.npm_arch == 'x64'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5
diff --git a/build/linux/package_reh.sh b/build/linux/package_reh.sh
index 4400583..a8f8f4f 100755
--- a/build/linux/package_reh.sh
+++ b/build/linux/package_reh.sh
@@ -200,7 +200,7 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
 
   EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
 
-  if [[ -n "${VERIFY_CX11}" ]]; then
+  if [[ -n "${VERIFY_CXX11}" ]]; then
     SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ../build/linux/verify_cxx11_requirements.sh
   fi
 
diff --git a/build/linux/verify_cxx11_requirements.sh b/build/linux/verify_cxx11_requirements.sh
index 7e6d357..eb5ad2f 100755
--- a/build/linux/verify_cxx11_requirements.sh
+++ b/build/linux/verify_cxx11_requirements.sh
@@ -8,7 +8,7 @@ echo "Verifying requirements for files: ${FILES}"
 
 for FILE in ${FILES}; do
   if [[ -n "$( strings "${FILE}" | grep cxx11 | tail -n1 )" ]]; then
-    echo "Error: File ${FILE} has dependency on ABI ${CXXABI_VERSION} > ${EXPECTED_CXXABI_VERSION}"
+    echo "Error: File ${FILE} has dependency on CXX11"
     exit 1
   fi
 done
diff --git a/patches/linux/arch-0-support.patch b/patches/linux/arch-0-support.patch
index 08148b0..85f9263 100644
--- a/patches/linux/arch-0-support.patch
+++ b/patches/linux/arch-0-support.patch
@@ -12,11 +12,6 @@ index 6805633..9d4b59f 100755
 -  SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" VSCODE_SYSROOT_PREFIX="-glibc-2.28-gcc-8.5.0" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
 +  SYSROOT_ARCH="$SYSROOT_ARCH" VSCODE_SYSROOT_DIR="$VSCODE_REMOTE_SYSROOT_DIR" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
  fi
-@@ -50,3 +50,3 @@ if [ "$npm_config_arch" == "x64" ]; then
-   export VSCODE_REMOTE_CXX=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/bin/x86_64-linux-gnu-g++
--  export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot"
-+  export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -D_GLIBCXX_USE_CXX11_ABI=0"
-   export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot -L$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/usr/lib/x86_64-linux-gnu -L$VSCODE_REMOTE_SYSROOT_DIR/x86_64-linux-gnu/x86_64-linux-gnu/sysroot/lib/x86_64-linux-gnu"
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
 index 10b7b44..0ad7550 100644
 --- a/build/gulpfile.reh.js