mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's always use libc++ when building for iOS against a current SDK

Browse Source 
I have been using it for a while and it seems to work fine. No need to
default to libstdc++.

Change-Id: Ifa6999921b1333317c112f57fa402188f787d27d
This commit is contained in:
Tor Lillqvist
2014-01-15 10:28:01 +02:00
parent 8c6342c258
commit 0b3513f34d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -1241,8 +1241,7 @@ AC_ARG_WITH(macosx-bundle-identifier,
AC_ARG_ENABLE(libc++, AC_ARG_ENABLE(libc++,
AS_HELP_STRING([--enable-libc++], AS_HELP_STRING([--enable-libc++],
[Use the libc++ C++ library instead of GNU libstdc++ on OS X. Only effective [Use the libc++ C++ library instead of GNU libstdc++ on OS X. Only effective
if --with-macosx-version-min-required is 10.7 or later. Experimental work in if --with-macosx-version-min-required is 10.7 or later.]),
progress, very likely breaks something, don't use unless you plan to fix that.]),
,) ,)
AC_ARG_ENABLE(ios-simulator, AC_ARG_ENABLE(ios-simulator,
@@ -3001,7 +3000,9 @@ if test $_os = iOS; then
# Just add -fvisibility=hidden to CC and CXX directly so that the 3rd-party libs also # Just add -fvisibility=hidden to CC and CXX directly so that the 3rd-party libs also
# get compiled with it, to avoid ld warnings when linking all that together into one # get compiled with it, to avoid ld warnings when linking all that together into one
# executable. # executable.
# Use libc++ if opted in only, and only when building against iOS 7 SDK or newer.
# Use libc++ for iOS 7 SDK and libstdc++ for earlier (but we don't really expect anybody to
# be be using an earlier SDK)
XCODE_CLANG_CXX_LIBRARY=libstdc++ XCODE_CLANG_CXX_LIBRARY=libstdc++
case $ios_sdk in case $ios_sdk in
@@ -3011,9 +3012,10 @@ if test $_os = iOS; then
fi fi
;; ;;
*) *)
if test "$enable_libc__" = yes; then if test "$enable_libc__" = no; then
XCODE_CLANG_CXX_LIBRARY=libc++ AC_MSG_ERROR([--disable-libc++ not allowed])
fi fi
XCODE_CLANG_CXX_LIBRARY=libc++
;; ;;
esac esac