ci: Remove obsolete compiler-wrapper
We don't actually need this anymore. We were previously using it to find ccache, but Meson will do this for us. Now that we pass -Wl,--fatal-warnings, we don't need to pass -Werror to the link stage either. This removes two shell execs, one subshell, and one call to each of grep and printf, per compile. Signed-off-by: Daniel Stone <daniels@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33137>
This commit is contained in:
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -e
|
||||
|
||||
_COMPILER=clang++-15
|
||||
. compiler-wrapper.sh
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -e
|
||||
|
||||
_COMPILER=clang++
|
||||
. compiler-wrapper.sh
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -e
|
||||
|
||||
_COMPILER=clang-15
|
||||
. compiler-wrapper.sh
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -e
|
||||
|
||||
_COMPILER=clang
|
||||
. compiler-wrapper.sh
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -e
|
||||
|
||||
_COMPILER=g++
|
||||
. compiler-wrapper.sh
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
# shellcheck disable=SC1091
|
||||
|
||||
set -e
|
||||
|
||||
_COMPILER=gcc
|
||||
. compiler-wrapper.sh
|
||||
@@ -1,21 +0,0 @@
|
||||
# shellcheck disable=SC1091
|
||||
# shellcheck disable=SC2086 # we want word splitting
|
||||
if command -V ccache >/dev/null 2>/dev/null; then
|
||||
CCACHE=ccache
|
||||
else
|
||||
CCACHE=
|
||||
fi
|
||||
|
||||
if echo "$@" | grep -E 'meson-private/tmp[^ /]*/testfile.c' >/dev/null; then
|
||||
# Invoked for meson feature check
|
||||
exec $CCACHE $_COMPILER "$@"
|
||||
fi
|
||||
|
||||
if [ "$(eval printf "'%s'" "\"\${$(($#-1))}\"")" = "-c" ]; then
|
||||
# Not invoked for linking
|
||||
exec $CCACHE $_COMPILER "$@"
|
||||
fi
|
||||
|
||||
# Compiler invoked by ninja for linking. Add -Werror to turn compiler warnings into errors
|
||||
# with LTO. (meson's werror should arguably do this, but meanwhile we need to)
|
||||
exec $CCACHE $_COMPILER "$@" -Werror
|
||||
@@ -28,9 +28,7 @@ export PATH=$PATH:$PWD/.gitlab-ci/build
|
||||
|
||||
touch native.file
|
||||
printf > native.file "%s\n" \
|
||||
"[binaries]" \
|
||||
"c = 'compiler-wrapper-${CC:-gcc}.sh'" \
|
||||
"cpp = 'compiler-wrapper-${CXX:-g++}.sh'"
|
||||
"[binaries]"
|
||||
|
||||
# We need to control the version of llvm-config we're using, so we'll
|
||||
# tweak the cross file or generate a native file to do so.
|
||||
|
||||
Reference in New Issue
Block a user