diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2019-10-07 08:44:39 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2019-10-07 08:44:39 +0000 |
| commit | acf55ad5845a28e98aadc8acc384567b95a91be1 (patch) | |
| tree | d46b6d5968a2a35cc82d53d17893218b739ed228 | |
| parent | dd27d2beeb65d7861fccf72d12898e123875337b (diff) | |
| parent | 2b34f52b019a001fbe8aea743e95f7a86751fcc9 (diff) | |
| download | glib-acf55ad5845a28e98aadc8acc384567b95a91be1.tar.gz | |
Merge branch 'solaris-build-fixes' into 'master'
Solaris build fixes
See merge request GNOME/glib!1146
| -rw-r--r-- | gio/gunixmounts.c | 3 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c index cf73fe5e0..cbf2ee99e 100644 --- a/gio/gunixmounts.c +++ b/gio/gunixmounts.c @@ -165,6 +165,9 @@ static guint64 mount_poller_time = 0; #endif #elif defined (HAVE_SYS_MNTTAB_H) #include <sys/mnttab.h> +#if defined(__sun) && !defined(mnt_opts) +#define mnt_opts mnt_mntopts +#endif #endif #ifdef HAVE_SYS_VFSTAB_H 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 |