configure.in | 46 +--
solenv/gbuild/platform/macosx.mk | 14 +++
2 files changed, 54 insertions(+), 6 deletions(-)
New commits:
commit a24a980424ec2ec81b13c8e5a95394d62cbf7406
Author: Tor Lillqvist t...@iki.fi
Date: Thu May 10 22:59:30 2012 +0300
Make visibility tests work as intended on Mac OS X
If the tests detect that visibiliy works, then use it also in
gbuild. In the old build system, -fvisibility=hidden was already
being used on Mac OS X if HAVE_GCC_VISIBILITY_FEATURE had been
detected.
In configure.in, let's not hardcode the -shared, -fpic and -Wl,-z,defs
options or the .so suffix used in visibility-related tests. Factor
them out and use platform-specific options. Done just for Mac OS X so
far. Using the Linux options for Mac OS X caused visibility tests to
silently and misleadingly fail.
Yes, it is silly to now define some platform-specific options in three
places: configure.in, solenv/inc/* for the old build system, and
solenv/gbuild/platform/* for gbuild.
At least with my Xcode3 installation, I need to pass an -isysroot flag
pointing to the SDK when running $CC -E, otherwise headers weren't
found. This was then misinterpreted as the visibility tests failing.
Pass -DHAVE_GCC_VISIBILITY_FEATURE to the compiler if configure
detected visibility working. In that case also pass
-fvisibility=hidden. HAVE_GCC_VISIBILITY_FEATURE being defined is
supposed to mean that the -fvisibility=hidden option is used, I think.
Pass also -fvisibility-inlines-hidden if that was detected to work.
Change-Id: I I I58d566fcb07584246e91f45e683ce9b31208edba
diff --git a/configure.in b/configure.in
index b09a935..4322a07 100644
--- a/configure.in
+++ b/configure.in
@@ -140,6 +140,18 @@ test_xrender=yes
test_cups=yes
test_fontconfig=yes
+# Default values, as such probably valid just for Linux, set
+# differently below just for Mac OS X,but at least better than
+# hardcoding these as we used to do. Much of this is duplicated also
+# in solenv for old build system and for gbuild, ideally we should
+# perhaps define stuff like this only here in configure.in?
+
+LINKFLAGSSHL=-shared
+PICSWITCH=-fpic
+DLLPOST=.so
+
+LINKFLAGSNOUNDEFS=-Wl,-z,defs
+
case $host_os in
solaris*)
@@ -244,6 +256,16 @@ darwin*) # Mac OS X or iOS
_os=Darwin
fi
enable_systray=no
+# See comment above the case $host_os
+LINKFLAGSSHL=-dynamiclib -single_module
+
+# -fPIC is default
+PICSWITCH=
+
+DLLPOST=.dylib
+
+# -undefined error is the default
+LINKFLAGSNOUNDEFS=
;;
freebsd*)
@@ -4661,6 +4683,11 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes
\); then
AC_LANG_PUSH([C++])
+save_CPPFLAGS=$CPPFLAGS
+if test -n $MACOSX_SDK_PATH; then
+CPPFLAGS=-isysroot $MACOSX_SDK_PATH $CPPFLAGS
+fi
+
if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then
AC_MSG_CHECKING([if STL headers are visibility safe])
AC_EGREP_HEADER(visibility push, string, stlvisok=yes, stlvisok=no)
@@ -4674,7 +4701,7 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes \);
then
if test $HAVE_GCC_VISIBILITY_FEATURE = TRUE; then
sharedlink_ldflags_save=$LDFLAGS
-LDFLAGS=$LDFLAGS -fvisibility-inlines-hidden -fpic -shared
+LDFLAGS=$LDFLAGS -fvisibility-inlines-hidden $PICSWITCH $LINKFLAGSSHL
AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL
headers])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -4682,7 +4709,13 @@ if test \( $_os != WINNT -o $WITH_MINGW = yes
\); then
using namespace std;
]], [[
istringstream strm( test ); return 0;
-]])],[$EGREP -q unresolvable conftest.err;
+]])],
+# Ugh, surely bad to assume an error message will contain
+# the word unresolvable, a problem with
+# -fvisibility-inlines-hidden and STL headers might cause
+# some more obscure message on some platform, and anway,
+# the error message could be localised.
+[$EGREP -q unresolvable conftest.err;
if test $? -eq 0; then gccvisok=no; else gccvisok=yes;
fi],[gccvisok=no
])
AC_MSG_RESULT([$gccvisok])
@@ -4708,16 +4741,15 @@ struct S2: S1int { virtual ~S2(); };
struct S3: S2 { virtual ~S3(); }; S3::~S3() {}
_ACEOF
gccvisinlineshiddenok=yes
-if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC
-fvisibility-inlines-hidden conftestlib1.cc -o libconftest1.so /dev/null
2/dev/null; then
+if ! $CXX $CXXFLAGS $CPPFLAGS $LINKFLAGSSHL -fPIC
-fvisibility-inlines-hidden conftestlib1.cc -o libconftest1$DLLPOST; then
gccvisinlineshiddenok=no
else
-if ! $CXX $CXXFLAGS $CPPFLAGS -shared -fPIC
-fvisibility-inlines-hidden conftestlib2.cc -L. -lconftest1 -Wl,-z,defs -o
libconftest2.so
