commit b6c7cfd490510a395ea36747f4a8682c6b1fc26f
author Paolo Bonzini <pbonzini@redhat.com> Mon Sep 21 04:49:50 2020 -0400
committer Paolo Bonzini <pbonzini@redhat.com> Sat Oct 03 08:18:56 2020 -0400
tree 750113426ae693a9135138ec8f84fa60ed9be6f6
parent 73362fc0b0c2d94e795a509f859e592572a09bfd

configure: move OpenBSD W^X test to meson

The TCG option is now passed through to Meson.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

meson.build

diff --git a/meson.build b/meson.build
index 743a650..60ecd03 100644
--- a/meson.build
+++ b/meson.build
@@ -124,6 +124,7 @@
 version_res = []
 coref = []
 iokit = []
+emulator_link_args = []
 cocoa = not_found
 hvf = not_found
 if targetos == 'windows'
@@ -146,6 +147,11 @@
   socket = [cc.find_library('posix_error_mapper'),
             cc.find_library('network'),
             cc.find_library('bsd')]
+elif targetos == 'openbsd'
+  if not get_option('tcg').disabled() and target_dirs.length() > 0
+    # Disable OpenBSD W^X if available
+    emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded')
+  endif
 endif
 
 accelerators = []
@@ -1247,7 +1253,7 @@
   c_args = ['-DNEED_CPU_H',
             '-DCONFIG_TARGET="@0@-config-target.h"'.format(target),
             '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)]
-  link_args = []
+  link_args = emulator_link_args
 
   config_target += config_host
   target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])]