xserver: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3aa754c3637694a2a3083b8fd9fba0bc862b1a67
Author: David Seifert <soap at gentoo.org>
Date:   Wed Feb 5 11:32:24 2020 +0100

    Always use `-fno-common` in CI
    
    * This prevents issues from creeping back in at a later stage.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a9be80d2..ddc06a9f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ autotools-build-and-test:
     script:
         - mkdir build/
         - cd build/
-        - ../autogen.sh --prefix=/usr
+        - ../autogen.sh --prefix=/usr CFLAGS="-fno-common"
         - make -j4 distcheck
         - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j4 check
         - cd ..
@@ -81,7 +81,7 @@ meson-build-and-test:
         PIGLIT_DIR: /root/piglit
         XTEST_DIR: /root/xts
     script:
-        - meson -Dprefix=/usr -Dxephyr=true -Dwerror=true build/
+        - meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true build/
         - ninja -j4 -C build/ install
         - ninja -j4 -C build/ test
         - .gitlab-ci/manpages-check