luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-14 19:55:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clang-win-stpcpy' into 'master'

Browse Source 
Don't misdetect stpcpy on windows platforms on clang

See merge request GNOME/glib!1439
This commit is contained in:
Philip Withnall 2020-05-12 11:39:44 +00:00
commit 06dc61ad6c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meson.build
View File

@ -554,13 +554,23 @@ foreach f : functions
endif endif
endforeach endforeach
# Check that stpcpy() is usable; must use header # Check that stpcpy() is usable; must use header.
if cc.has_function('stpcpy', prefix : '#include <string.h>') # cc.has_function() in some cases (clang, gcc 10+) assumes that if the
# compiler provides a builtin of the same name that the function exists, while
# it's in fact not provided by any header or library. This is true for
# stpcpy() on Windows using clang and gcc as well as posix_memalign() using
# gcc on Windows. Skip these checks on Windows for now to avoid false
# positives. See https://github.com/mesonbuild/meson/pull/7116,
# https://github.com/mesonbuild/meson/issues/3672 and
# https://github.com/mesonbuild/meson/issues/5628.
# FIXME: Once meson no longer returns success for stpcpy() and
# posix_memalign() on Windows using GCC and clang we can remove this.
if host_system != 'windows' and cc.has_function('stpcpy', prefix : '#include <string.h>')
glib_conf.set('HAVE_STPCPY', 1) glib_conf.set('HAVE_STPCPY', 1)
endif endif
# Check that posix_memalign() is usable; must use header # Check that posix_memalign() is usable; must use header
if cc.has_function('posix_memalign', prefix : '#include <stdlib.h>') if host_system != 'windows' and cc.has_function('posix_memalign', prefix : '#include <stdlib.h>')
glib_conf.set('HAVE_POSIX_MEMALIGN', 1) glib_conf.set('HAVE_POSIX_MEMALIGN', 1)
endif endif