From c01747555fe3337256b71eb0c9ffcc6ac27276ee Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 5 Jul 2020 19:37:15 +0200 Subject: [PATCH] Remove explicit libc++ option, it is the default anyhow now No supported version still use libstdc++ by default, so remove the useless option. --- configure | 4 ---- configure.in | 9 --------- 2 files changed, 13 deletions(-) diff --git a/configure b/configure index 5aec52a34d..af6a54f13d 100755 --- a/configure +++ b/configure @@ -18715,10 +18715,6 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then retest_macosx_linking=yes fi -if test "$HAVE_CXX11" = "1" ; then - eval "CXX=\"$CXX -stdlib=libc++\"" -fi - if test "x$retest_macosx_linking" = "xyes"; then if test "x$macosx_sdk_specified" = "xyes"; then error_message="try using --with-macosx-sdk with a different SDK or \ diff --git a/configure.in b/configure.in index 97a4604b0b..a34c80a94b 100644 --- a/configure.in +++ b/configure.in @@ -1332,15 +1332,6 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then retest_macosx_linking=yes fi -if test "$HAVE_CXX11" = "1" ; then - 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++, so - dnl putting this in just CXXFLAGS wouldn't be enough) and when linking - dnl (both libraries and plugins, using bakefile shared-ld-sh script which - dnl doesn't handle this option, so putting it in LDFLAGS wouldn't work). - eval "CXX=\"$CXX -stdlib=libc++\"" -fi - dnl If either an SDK or a version option was added, make sure that we can dnl still compile and link both C and C++. If we didn't do this, then most dnl of the remaining tests would fail.