Skip to content

Commit 12bda01

Browse files
authored
Fix error message about exceptions. (#24248)
As far as I can tell -fno-except doesn't exist.
1 parent 0bae7e4 commit 12bda01

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/jsifier.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ function(${args}) {
486486
if (LINK_AS_CXX && !WASM_EXCEPTIONS && symbol.startsWith('__cxa_find_matching_catch_')) {
487487
if (DISABLE_EXCEPTION_THROWING) {
488488
error(
489-
'DISABLE_EXCEPTION_THROWING was set (likely due to -fno-exceptions), which means no C++ exception throwing support code is linked in, but exception catching code appears. Either do not set DISABLE_EXCEPTION_THROWING (if you do want exception throwing) or compile all source files with -fno-except (so that no exceptions support code is required); also make sure DISABLE_EXCEPTION_CATCHING is set to the right value - if you want exceptions, it should be off, and vice versa.',
489+
'DISABLE_EXCEPTION_THROWING was set (likely due to -fno-exceptions), which means no C++ exception throwing support code is linked in, but exception catching code appears. Either do not set DISABLE_EXCEPTION_THROWING (if you do want exception throwing) or compile all source files with -fno-exceptions (so that no exceptions support code is required); also make sure DISABLE_EXCEPTION_CATCHING is set to the right value - if you want exceptions, it should be off, and vice versa.',
490490
);
491491
return;
492492
}

src/lib/libexceptions_stub.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var LibraryExceptions = {};
2424
#if !INCLUDE_FULL_LIBRARY
2525
// This method of link-time error generation is not compatible with INCLUDE_FULL_LIBRARY
2626
LibraryExceptions[name + '__deps'] = [function() {
27-
error(`DISABLE_EXCEPTION_THROWING was set (likely due to -fno-exceptions), which means no C++ exception throwing support code is linked in, but such support is required by symbol '${name}'. Either do not set DISABLE_EXCEPTION_THROWING (if you do want exception throwing) or compile all source files with -fno-except (so that no exceptions support code is required); also make sure DISABLE_EXCEPTION_CATCHING is set to the right value - if you want exceptions, it should be off, and vice versa.`);
27+
error(`DISABLE_EXCEPTION_THROWING was set (likely due to -fno-exceptions), which means no C++ exception throwing support code is linked in, but such support is required by symbol '${name}'. Either do not set DISABLE_EXCEPTION_THROWING (if you do want exception throwing) or compile all source files with -fno-exceptions (so that no exceptions support code is required); also make sure DISABLE_EXCEPTION_CATCHING is set to the right value - if you want exceptions, it should be off, and vice versa.`);
2828
}];
2929
#endif
3030
});

0 commit comments

Comments
 (0)