another temp fix

MaterializeInc · Aug 31, 2024 · ca2f1dd · ca2f1dd
1 parent 81128f8
commit ca2f1dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/sysroot/Dockerfile b/sysroot/Dockerfile
@@ -162,7 +162,7 @@ RUN make install all-target-libgfortran
 RUN make install all-target-libstdc++-v3
 
 FROM gcc as gcc_pruned
-RUN --mount=source=prune_gcc.sh,target=/usr/bin/prune_gcc.sh prune_gcc.sh "${LIBSTDCXX_VERSION}" "${LIBSTDCXX_MAJOR}"
+RUN --mount=source=prune_gcc.sh,target=/usr/bin/prune_gcc.sh prune_gcc.sh
 
 ####################################################################################################
 # Assemble final sysroots

diff --git a/sysroot/prune_gcc.sh b/sysroot/prune_gcc.sh
@@ -2,24 +2,21 @@
 
 set -eux
 
-LIBSTDCXX_VERSION=$1
-LIBSTDCXX_MAJOR=$2
-
 rm -rf /var/buildlibs/gcc/bin
 rm -rf /var/buildlibs/gcc/usr/bin
 rm -rf /var/buildlibs/gcc/libexec
 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/${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
+  mv /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/11.4.0 /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/11
+  mv /var/buildlibs/gcc/include/c++/11.4.0 /var/buildlibs/gcc/include/c++/11
+  mv /var/buildlibs/gcc/include/c++/11/${ARCH}-linux /var/buildlibs/gcc/include/c++/11/${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/${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/lib/gcc/${ARCH}-linux-gnu/11.4.0 /var/buildlibs/gcc/lib/gcc/${ARCH}-linux-gnu/11
+  mv /var/buildlibs/gcc/${ARCH}-linux/include/c++/11.4.0 /var/buildlibs/gcc/${ARCH}-linux/include/c++/11
+  mv /var/buildlibs/gcc/${ARCH}-linux/include/c++/11/${ARCH}-linux /var/buildlibs/gcc/${ARCH}-linux/include/c++/11/${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