Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert to using -stdlib=libc++ as part of CXX under OS X

Browse Source 
Putting it in LDFLAGS breaks compilation of plugins using shared-ld-sh script
for linking as it doesn't support this option.
This commit is contained in:
Vadim Zeitlin
2016-01-29 15:15:14 +01:00
parent 9e6af23062
commit 7aedb3f064
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -20419,9 +20419,7 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
fi fi
if test "$HAVE_CXX11" = "1" ; then if test "$HAVE_CXX11" = "1" ; then
CXXFLAGS="$CXXFLAGS -stdlib=libc++" eval "CXX=\"$CXX -stdlib=libc++\""
OBJCXXFLAGS="$OBJCXXFLAGS -stdlib=libc++"
LDFLAGS="$LDFLAGS -stdlib=libc++"
fi fi
if test "x$retest_macosx_linking" = "xyes"; then if test "x$retest_macosx_linking" = "xyes"; then

10
configure.in
View File

@@ -1239,11 +1239,11 @@ fi
if test "$HAVE_CXX11" = "1" ; then if test "$HAVE_CXX11" = "1" ; then
dnl We also need to use libc++ standard library instead of libstdc++ for dnl We also need to use libc++ standard library instead of libstdc++ for
dnl C++11 support, both when compiling (for both C++ and Objective-C++) and dnl C++11 support, both when compiling (for both C++ and Objective-C++, so
dnl when linking. dnl putting this in just CXXFLAGS wouldn't be enough) and when linking
CXXFLAGS="$CXXFLAGS -stdlib=libc++" dnl (both libraries and plugins, using bakefile shared-ld-sh script which
OBJCXXFLAGS="$OBJCXXFLAGS -stdlib=libc++" dnl doesn't handle this option, so putting it in LDFLAGS wouldn't work).
LDFLAGS="$LDFLAGS -stdlib=libc++" eval "CXX=\"$CXX -stdlib=libc++\""
fi fi
dnl If either an SDK or a version option was added, make sure that we can dnl If either an SDK or a version option was added, make sure that we can