.gitlab-ci.yml: supply -fstack-protector required by latest MinGW

https://sourceforge.net/p/mingw-w64/bugs/818/

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 315ba05ca734e46b2a12fdbfaf7f712aa0ac3ca1..2132d679756c7bc205b2ccf261ccee2e4913c13c 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 # name to allow expiration of old caches.
 
 cache:
-  key: "$CI_JOB_NAME-ver17"
+  key: "$CI_JOB_NAME-ver18"
   paths:
     - cache/
 
@@ -319,6 +319,9 @@ MinGW32.DLLs:
   - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
   - ./bootstrap
   - export CC="ccache i686-w64-mingw32-gcc"
+  - export CFLAGS="-fstack-protector"
+  - export CXXFLAGS="-fstack-protector"
+  - export LDFLAGS="-fstack-protector"
   - export WINEPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin
   - dash ./configure --disable-gcc-warnings --host=i686-w64-mingw32 --target=i686-w64-mingw32 --cache-file cache/config.cache --with-included-libtasn1 --disable-nls --disable-guile --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-full-test-suite --disable-doc
   - mingw32-make -j$BUILDJOBS
@@ -360,6 +363,9 @@ MinGW64.DLLs:
   - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
   - ./bootstrap
   - export CC="ccache x86_64-w64-mingw32-gcc"
+  - export CFLAGS="-fstack-protector"
+  - export CXXFLAGS="-fstack-protector"
+  - export LDFLAGS="-fstack-protector"
   - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
   - dash ./configure --disable-gcc-warnings --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 --cache-file cache/config.cache --with-included-libtasn1 --disable-guile --disable-nls --with-included-unistring --enable-local-libopts --disable-non-suiteb-curves --disable-full-test-suite --disable-doc
   - mingw64-make -j$BUILDJOBS
@@ -401,6 +407,9 @@ MinGW64.DLLs.Vista+:
   - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
   - ./bootstrap
   - export CC="ccache x86_64-w64-mingw32-gcc"
+  - export CFLAGS="-fstack-protector"
+  - export CXXFLAGS="-fstack-protector"
+  - export LDFLAGS="-fstack-protector"
  # Target Vista instead of XP, currently the default in mingw
   - export CPPFLAGS="-D_WIN32_WINNT=0x600"
   - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
@@ -442,6 +451,9 @@ MinGW64.Vista+:
   script:
   - ./bootstrap
   - export CC="ccache x86_64-w64-mingw32-gcc"
+  - export CFLAGS="-fstack-protector"
+  - export CXXFLAGS="-fstack-protector"
+  - export LDFLAGS="-fstack-protector"
  # Target Vista instead of XP, currently the default in mingw
   - export CPPFLAGS="-D_WIN32_WINNT=0x600"
   - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
@@ -478,6 +490,9 @@ MinGW64:
   script:
   - ./bootstrap
   - export CC="ccache x86_64-w64-mingw32-gcc"
+  - export CFLAGS="-fstack-protector"
+  - export CXXFLAGS="-fstack-protector"
+  - export LDFLAGS="-fstack-protector"
   - export WINEPATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin
   - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
   - echo ':DOSWin:M::MZ::/usr/bin/wine64:' > /proc/sys/fs/binfmt_misc/register
@@ -512,6 +527,9 @@ MinGW32:
   script:
   - ./bootstrap
   - export CC="ccache i686-w64-mingw32-gcc"
+  - export CFLAGS="-fstack-protector"
+  - export CXXFLAGS="-fstack-protector"
+  - export LDFLAGS="-fstack-protector"
   - export WINEPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin
   - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
   - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register