remove broken compiler wrapper hack

eth-cscs · Nov 7, 2022 · 64f6ceb · 64f6ceb
1 parent cb89c4d
commit 64f6ceb
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 48 deletions.
diff --git a/.github/workflows/update.sh b/.github/workflows/update.sh
@@ -36,7 +36,6 @@ export PATH="$PWD:$PATH"
     curl -LfSs "https://api.github.com/repos/spack/spack/tarball/$SPACK_SHA" | tar --strip-components=1 -xz -C spack_src
     echo "$SPACK_SHA" > spack_sha
 
-    patch -p1 -d spack_src -i "$GITHUB_WORKSPACE/build/patches/hack-wrapper.patch"
     cp "$GITHUB_WORKSPACE/build/6_spack/config.yaml" spack_src/etc/spack/
 
     find . '(' -iname '*.pyc' -o -iname '__pycache__' ')' -print0 | xargs --null rm -rf

diff --git a/build/patches/hack-wrapper.patch b/build/patches/hack-wrapper.patch
diff --git a/setup.sh b/setup.sh
@@ -27,8 +27,6 @@ mkdir -p /opt/spack && curl -Ls "https://api.github.com/repos/spack/spack/tarbal
 # Install a relatively recent cmake
 curl -Ls "https://github.com/Kitware/CMake/releases/download/v3.20.1/cmake-3.20.1-linux-$(arch).tar.gz" | tar --strip-components=1 -xz -C /usr/local
 
-patch -p1 -d /opt/spack -i /build/patches/hack-wrapper.patch
-
 patch -p1 -d /opt/spack -i /build/patches/curl.patch
 patch -p1 -d /opt/spack -i /build/patches/gettext.patch
 patch -p1 -d /opt/spack -i /build/patches/gpg.patch

diff --git a/unshare.sh b/unshare.sh
@@ -21,6 +21,5 @@ chroot rootfs env --ignore-environment - \
     CCACHE_DIR=/build/ccache \
     SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt \
     GIT_SSL_CAINFO=/etc/ssl/certs/ca-bundle.crt \
-    SPACK_OPTIMIZATION_FLAGS="-Os" \
     TARGET=$(arch) \
     "$@"