diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-03 11:57:04 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-06 08:33:51 +0200 |
| commit | e46bd55d9cbb45b4e6681dd91da0fca821e2ed9d (patch) | |
| tree | aa284ac2b95766d9488c455ee0a6f8ba6b110366 | |
| parent | ccd250aa2d8e214195d5cee37c1ddc58e123b821 (diff) | |
configure: convert HAVE_BROKEN_SIZE_MAX to meson
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | meson.build | 9 |
2 files changed, 9 insertions, 17 deletions
@@ -2376,20 +2376,6 @@ if test "$softmmu" = "no"; then fi ########################################## -# Some versions of Mac OS X incorrectly define SIZE_MAX -cat > $TMPC << EOF -#include <stdint.h> -#include <stdio.h> -int main(int argc, char *argv[]) { - return printf("%zu", SIZE_MAX); -} -EOF -have_broken_size_max=no -if ! compile_object -Werror ; then - have_broken_size_max=yes -fi - -########################################## # L2TPV3 probe cat > $TMPC <<EOF @@ -5360,9 +5346,6 @@ if test "$gdbus_codegen" != "" ; then echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak fi echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak -if test "$have_broken_size_max" = "yes" ; then - echo "HAVE_BROKEN_SIZE_MAX=y" >> $config_host_mak -fi if test "$have_openpty" = "yes" ; then echo "HAVE_OPENPTY=y" >> $config_host_mak fi diff --git a/meson.build b/meson.build index b5dcc3d70e..79b5834266 100644 --- a/meson.build +++ b/meson.build @@ -1268,6 +1268,15 @@ config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) config_host_data.set('CONFIG_PREADV', cc.has_function('preadv', prefix: '#include <sys/uio.h>')) config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_function('system', prefix: '#include <stdlib.h>')) +# Some versions of Mac OS X incorrectly define SIZE_MAX +config_host_data.set('HAVE_BROKEN_SIZE_MAX', not cc.compiles(''' + #include <stdint.h> + #include <stdio.h> + int main(int argc, char *argv[]) { + return printf("%zu", SIZE_MAX); + }''', args: ['-Werror'])) + + ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST'] strings = ['HOST_DSOSUF', 'CONFIG_IASL'] |