Neither Go nor MinGW builds were able to deal with our
previous way of enabling ccache correctly, which forced us
to work around the issue at the job template level.
Now that ccache is enabled in a completely transparent
fashion through a symlink farm, we can drop the workaround.
Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
jobs/defaults.yaml | 6 ------
jobs/go.yaml | 8 --------
2 files changed, 14 deletions(-)
diff --git a/jobs/defaults.yaml b/jobs/defaults.yaml
index 99e8b62..43686c5 100644
--- a/jobs/defaults.yaml
+++ b/jobs/defaults.yaml
@@ -23,17 +23,11 @@
global_env: |
local_env: |
mingw32_local_env: |
- # The MinGW build needs to use the MinGW compiler toolchain,
- # while $CC is pointing to the native toolchain, so we have
- # to unset it here.
- export CC=
export VIRT_PREFIX="$VIRT_PREFIX/i686-w64-mingw32/sys-root/mingw"
export PKG_CONFIG_PATH="$VIRT_PREFIX/lib/pkgconfig"
export PKG_CONFIG_LIBDIR="/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/share/pkgconfig"
mingw32_autogen_args: --host=i686-w64-mingw32
mingw64_local_env: |
- # See above
- export CC=
export VIRT_PREFIX="$VIRT_PREFIX/x86_64-w64-mingw32/sys-root/mingw"
export PKG_CONFIG_PATH="$VIRT_PREFIX/lib/pkgconfig"
export PKG_CONFIG_LIBDIR="/usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig"
diff --git a/jobs/go.yaml b/jobs/go.yaml
index 9a349ca..bffe56e 100644
--- a/jobs/go.yaml
+++ b/jobs/go.yaml
@@ -42,11 +42,6 @@
- shell: |
{global_env}
{local_env}
- # go doesn't handle the $CC variable containing whitespace
- # correctly, so we have to make sure it's unset when building.
- # See https://github.com/golang/go/issues/11685
- export CC=
-
go build -v
publishers:
- email:
@@ -85,9 +80,6 @@
- shell: |
{global_env}
{local_env}
- # See above
- export CC=
-
go test $TEST_ARGS
publishers:
- email:
--
2.14.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
