commit | b2a54dfb8fe3859cf8c7f1d1d9b43318ef2a0ca3 | [log] [tgz] |
---|---|---|
author | Nirbheek Chauhan <nirbheek@centricular.com> | Wed Nov 04 17:43:21 2020 +0530 |
committer | Akira TAGOH <akira@tagoh.org> | Thu Nov 05 04:27:55 2020 +0000 |
tree | 74ee0b5c7ce1db509a5ec3bd443fe1cc0350e00a | |
parent | d9c99340b150098c1b117db2b81ec5ce0df54ff5 [diff] |
meson: Fix build failure with gcc10 on mingw We were explicitly setting c_args and c_link_args to [], which overrode the values inherited from the env via CFLAGS and LDFLAGS. Also add a comment for future reference. Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/263
diff --git a/.gitlab-ci/linux-mingw-w64-64bit.txt b/.gitlab-ci/linux-mingw-w64-64bit.txt index 0535654..fd4a640 100644 --- a/.gitlab-ci/linux-mingw-w64-64bit.txt +++ b/.gitlab-ci/linux-mingw-w64-64bit.txt
@@ -5,8 +5,9 @@ endian = 'little' [properties] -c_args = [] -c_link_args = [] +# Will be picked up from env vars if not defined here +#c_args = [] +#c_link_args = [] [binaries] c = 'x86_64-w64-mingw32-gcc'