fix prune_gcc.sh

* adjust the script to account for different versions of libstdc++
MaterializeInc · Aug 29, 2024 · 28d0264 · 28d0264
1 parent 2222e09
commit 28d0264
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/sysroot.yml b/.github/workflows/sysroot.yml
@@ -50,6 +50,10 @@ jobs:
           DOCKER_IMAGE_TAG=$(tr '[:upper:]' '[:lower:]' <<< "sysroot-$GITHUB_TAG-${{ inputs.arch }}")
           echo "DOCKER_IMAGE_TAG=$DOCKER_IMAGE_TAG" >> $GITHUB_ENV
 
+          libstd_version=${{ inputs.libstdcxx_version }}
+          LIBSTDCXX_MAJOR="${libstd_version%%.*}"
+          echo "LIBSTDCXX_MAJOR=$LIBSTDCXX_MAJOR" >> $GITHUB_ENV
+
       - name: Build Sysroot in Docker
         run: |
           cd sysroot

diff --git a/sysroot/prune_gcc.sh b/sysroot/prune_gcc.sh
@@ -9,14 +9,14 @@ rm -rf /var/buildlibs/gcc/share
 
 if [ "$ARCH" == 'x86_64' ]; then
   mv /var/buildlibs/gcc/lib/gcc/${ARCH}-linux /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu
-  mv /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/10.3.0 /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/10
-  mv /var/buildlibs/gcc/include/c++/10.3.0 /var/buildlibs/gcc/include/c++/10
-  mv /var/buildlibs/gcc/include/c++/10/${ARCH}-linux /var/buildlibs/gcc/include/c++/10/${ARCH}-linux-gnu
+  mv /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/${LIBSTDCXX_VERSION} /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/${LIBSTDCXX_MAJOR}
+  mv /var/buildlibs/gcc/include/c++/${LIBSTDCXX_VERSION} /var/buildlibs/gcc/include/c++/${LIBSTDCXX_MAJOR}
+  mv /var/buildlibs/gcc/include/c++/${LIBSTDCXX_MAJOR}/${ARCH}-linux /var/buildlibs/gcc/include/c++/${LIBSTDCXX_MAJOR}/${ARCH}-linux-gnu
 elif [ "$ARCH" == 'aarch64' ]; then
   mv /var/buildlibs/gcc/lib/gcc/${ARCH}-linux /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu
-  mv /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/10.3.0 /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/10
-  mv /var/buildlibs/gcc/${ARCH}-linux/include/c++/10.3.0 /var/buildlibs/gcc/${ARCH}-linux/include/c++/10
-  mv /var/buildlibs/gcc/${ARCH}-linux/include/c++/10/${ARCH}-linux /var/buildlibs/gcc/${ARCH}-linux/include/c++/10/${ARCH}-linux-gnu
+  mv /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/${LIBSTDCXX_VERSION} /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/${LIBSTDCXX_MAJOR}
+  mv /var/buildlibs/gcc/${ARCH}-linux/include/c++/${LIBSTDCXX_VERSION} /var/buildlibs/gcc/${ARCH}-linux/include/c++/${LIBSTDCXX_MAJOR}
+  mv /var/buildlibs/gcc/${ARCH}-linux/include/c++/${LIBSTDCXX_MAJOR}/${ARCH}-linux /var/buildlibs/gcc/${ARCH}-linux/include/c++/${LIBSTDCXX_MAJOR}/${ARCH}-linux-gnu
   mv /var/buildlibs/gcc/${ARCH}-linux/include/c++ /var/buildlibs/gcc/include/c++
   mv /var/buildlibs/gcc/${ARCH}-linux/lib64/* /var/buildlibs/gcc/lib64/
   rm -r /var/buildlibs/gcc/${ARCH}-linux