summaryrefslogtreecommitdiff
path: root/hw/xfree86
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2019-09-23 16:28:42 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2019-09-23 16:28:42 -0700
commit6036e845271800b2e268f5cba9283ce07a7fad3a (patch)
tree10f7e1ee342d4d1f4e5c530ffc05cfd62c27e87b /hw/xfree86
parent0e8c0d2f238e5d50daaf4672bd80ad519673b5e3 (diff)
meson: fix builds on Solaris 11.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'hw/xfree86')
-rw-r--r--hw/xfree86/meson.build2
-rw-r--r--hw/xfree86/os-support/meson.build4
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index c80964ea4..8b657acf0 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -75,6 +75,8 @@ endif
if host_machine.system() == 'cygwin' or host_machine.system() == 'windows'
linker_export_flags = '-Wl,--export-all-symbols'
+elif host_machine.system() == 'sunos'
+ linker_export_flags = []
else
linker_export_flags = '-Wl,--export-dynamic'
endif
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 484a118e7..6e426665a 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -16,7 +16,7 @@ os_c_args = []
if get_option('pciaccess')
srcs_xorg_os_support += 'bus/Pci.c'
- if host_machine.system() != 'linux' and host_machine.system() != 'solaris'
+ if host_machine.system() != 'linux'
srcs_xorg_os_support += 'bus/bsd_pci.c'
endif
if host_machine.cpu() == 'sparc'
@@ -60,7 +60,7 @@ if host_machine.system() == 'linux'
srcs_xorg_os_support += 'shared/pm_noop.c'
endif
-elif host_machine.system() == 'solaris'
+elif host_machine.system() == 'sunos'
srcs_xorg_os_support += [
'solaris/sun_apm.c',
'solaris/sun_bell.c',