Skip to content

Commit 5949d5a

Browse files
[libc++abi] Add more checks to ensure our patch is upstreamable (#23544)
We use the same libcxxabi for every platform and emscripten patches break compilation when targeting linux-armv7a
1 parent 13947f4 commit 5949d5a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

system/lib/libcxxabi/src/private_typeinfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,7 +1546,7 @@ __base_class_type_info::search_below_dst(__dynamic_cast_info* info,
15461546

15471547

15481548
// XXX EMSCRIPTEN
1549-
#ifndef __WASM_EXCEPTIONS__
1549+
#if defined(__wasm__) && !defined(__WASM_EXCEPTIONS__)
15501550

15511551
#include "cxa_exception.h"
15521552

@@ -1601,5 +1601,5 @@ void *__cxa_get_exception_ptr(void *thrown_object) throw() {
16011601

16021602
} // __cxxabiv1
16031603

1604-
#endif // !__WASM_EXCEPTIONS__
1604+
#endif // __wasm__ && !__WASM_EXCEPTIONS__
16051605

0 commit comments

Comments
 (0)