Install gcc-10/g++-10 to match sysroot

Author: devm33

.github/workflows/ci.yml

@@ -25,9 +25,13 @@ jobs:
       - name: Install sysroot
         if: runner.os == 'Linux'
         run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y gcc-10 g++-10
           SYSROOT_PATH=$(node scripts/linux/install-sysroot.js x64 | grep "SYSROOT_PATH=" | cut -d= -f2)
           echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV
           echo "Sysroot path set to: $SYSROOT_PATH"
+          echo "CC=gcc-10" >> $GITHUB_ENV
+          echo "CXX=g++-10" >> $GITHUB_ENV
 
       - name: Install dependencies and build
         run: npm ci

binding.gyp

@@ -97,24 +97,39 @@
               },
               'conditions': [
                 ['sysroot!=""', {
+                  'variables': {
+                    'gcc_include%': '<!(${CXX:-g++} -print-file-name=include)',
+                  },
                   'conditions': [
                     ['target_arch=="x64"', {
                       'cflags': [
                         '--sysroot=<(sysroot)',
+                        '-nostdinc',
+                        '-isystem<(gcc_include)',
+                        '-isystem<(sysroot)/usr/include',
+                        '-isystem<(sysroot)/usr/include/x86_64-linux-gnu'
+                      ],
+                      'cflags_cc': [
                         '-nostdinc++',
-                        '-isystem<(sysroot)/usr/include/c++/10',
-                        '-isystem<(sysroot)/usr/include/x86_64-linux-gnu/c++/10',
-                        '-isystem<(sysroot)/usr/include/c++/10/backward'
+                        '-isystem<(sysroot)/../include/c++/10.5.0',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/x86_64-linux-gnu',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/backward'
                       ],
                       'ldflags': ['--sysroot=<(sysroot)'],
                     }],
                     ['target_arch=="arm64"', {
                       'cflags': [
                         '--sysroot=<(sysroot)',
+                        '-nostdinc',
+                        '-isystem<(gcc_include)',
+                        '-isystem<(sysroot)/usr/include',
+                        '-isystem<(sysroot)/usr/include/aarch64-linux-gnu'
+                      ],
+                      'cflags_cc': [
                         '-nostdinc++',
-                        '-isystem<(sysroot)/usr/include/c++/10',
-                        '-isystem<(sysroot)/usr/include/aarch64-linux-gnu/c++/10',
-                        '-isystem<(sysroot)/usr/include/c++/10/backward'
+                        '-isystem<(sysroot)/../include/c++/10.5.0',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/aarch64-linux-gnu',
+                        '-isystem<(sysroot)/../include/c++/10.5.0/backward'
                       ],
                       'ldflags': ['--sysroot=<(sysroot)'],
                     }]

pipelines/build.yml

@@ -15,8 +15,12 @@ steps:
 
 - bash: |
     if [ "$(uname)" = "Linux" ]; then
+      sudo apt-get update -qq
+      sudo apt-get install -y gcc-10 g++-10
       SYSROOT_PATH=$(node scripts/linux/install-sysroot.js ${{ parameters.arch }} | grep "SYSROOT_PATH=" | cut -d= -f2)
       echo "##vso[task.setvariable variable=SYSROOT_PATH]$SYSROOT_PATH"
+      echo "##vso[task.setvariable variable=CC]gcc-10"
+      echo "##vso[task.setvariable variable=CXX]g++-10"
       echo "Sysroot path set to: $SYSROOT_PATH"
     fi
   displayName: 'Install sysroot (Linux only)'
@@ -27,3 +31,5 @@ steps:
     ARCH: ${{ parameters.arch }}
     npm_config_arch: ${{ parameters.arch }}
     SYSROOT_PATH: $(SYSROOT_PATH)
+    CC: $(CC)
+    CXX: $(CXX)