Skip to content

Commit b2ddb90

Browse files
authored
[libc++] Don't try to be compatible with libstdc++ in __libcpp_refstring on iOS (llvm#170816)
iOS doesn't provide a libstdc++ dylib anymore, so we can remove the compatiblity check whether we can load the dylib.
1 parent 51d928f commit b2ddb90

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libcxx/src/include/refstring.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <cstring>
1616
#include <stdexcept>
1717

18-
// MacOS and iOS used to ship with libstdc++, and still support old applications
18+
// MacOS used to ship with libstdc++, and still support old applications
1919
// linking against libstdc++. The libc++ and libstdc++ exceptions are supposed
2020
// to be ABI compatible, such that they can be thrown from one library and caught
2121
// in the other.
@@ -25,7 +25,7 @@
2525
// string singleton before manipulating the reference count. This is done so that
2626
// if an exception is created with a zero-length string in libstdc++, libc++abi
2727
// won't try to delete the memory.
28-
#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) || defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
28+
#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
2929
# define _LIBCPP_CHECK_FOR_GCC_EMPTY_STRING_STORAGE
3030
# include <dlfcn.h>
3131
# include <mach-o/dyld.h>

0 commit comments

Comments
 (0)