From 2b34f52b019a001fbe8aea743e95f7a86751fcc9 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri, 4 Oct 2019 13:23:25 -0700
Subject: [PATCH] build: no --export-dynamic ldflags for Solaris

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 gio/gunixmounts.c | 2 +-
 meson.build       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 1e45a5b13..cbf2ee99e 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -165,7 +165,7 @@ static guint64 mount_poller_time = 0;
 #endif
 #elif defined (HAVE_SYS_MNTTAB_H)
 #include <sys/mnttab.h>
-#ifdef _sun
+#if defined(__sun) && !defined(mnt_opts)
 #define mnt_opts mnt_mntopts
 #endif
 #endif
diff --git a/meson.build b/meson.build
index cc49b8a48..0177c6ba7 100644
--- a/meson.build
+++ b/meson.build
@@ -2027,6 +2027,8 @@ elif host_system == 'cygwin'
   export_dynamic_ldflags = ['-Wl,--export-all-symbols']
 elif host_system == 'darwin'
   export_dynamic_ldflags = []
+elif host_system == 'sunos'
+  export_dynamic_ldflags = []
 else
   export_dynamic_ldflags = ['-Wl,--export-dynamic']
 endif