Skip to content

fix(🐛): set -fexceptions and -frtti flag in the Skia build #3595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wcandillon merged 1 commit into from
Dec 11, 2025
Merged

fix(🐛): set -fexceptions and -frtti flag in the Skia build #3595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "externals/skia"]
path = externals/skia
url = https://chromium.googlesource.com/skia/
branch = chrome/m142
branch = chrome/m144
[submodule "externals/depot_tools"]
path = externals/depot_tools
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
2 changes: 1 addition & 1 deletion externals/depot_tools
Open in desktop
Submodule depot_tools updated from 8a1ec6 to a6671c
2 changes: 1 addition & 1 deletion externals/skia
Open in desktop
Submodule skia updated from f4ed99 to ee20d5
6 changes: 0 additions & 6 deletions packages/skia/scripts/build-skia.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,12 +294,6 @@ const buildXCFrameworks = () => {
`sed -i '' 's/uint32(bindingInfo\\.binding)/uint32_t(bindingInfo.binding)/g' ${shaderModuleFile}`
);

// Remove partition_alloc line from dawn.gni
const dawnGniFile = `${SkiaSrc}/build_overrides/dawn.gni`;
$(
`sed -i '' '/dawn_partition_alloc_dir = "\\/\\/third_party\\/externals\\/partition_alloc"/d' ${dawnGniFile}`
);

console.log("Patches applied successfully");
}
$(`rm -rf ${PackageRoot}/libs`);
Expand Down
56 changes: 45 additions & 11 deletions packages/skia/scripts/skia-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ const DEBUG = false;
export const GRAPHITE = !!process.env.SK_GRAPHITE;
export const MACCATALYST = !GRAPHITE;
const BUILD_WITH_PARAGRAPH = true;
// Re-enable mutable SkPath methods (addPath, moveTo, lineTo, etc.)
// Skia is transitioning to immutable SkPath with SkPathBuilder
// Set to false once we migrate to SkPathBuilder
const ENABLE_SKPATH_EDIT_METHODS = true;
const PATH_EDIT_FLAG = ENABLE_SKPATH_EDIT_METHODS
? "-USK_HIDE_PATH_EDIT_METHODS"
: "";

export const SkiaSrc = path.join(__dirname, "../../../externals/skia");
export const ProjectRoot = path.join(__dirname, "../../..");
Expand Down Expand Up @@ -85,7 +92,6 @@ export const commonArgs = [
//["skia_enable_ganesh", !GRAPHITE],
["skia_enable_graphite", GRAPHITE],
["skia_use_dawn", GRAPHITE],
["skia_use_cpp20", GRAPHITE],
];

export type PlatformName = "apple" | "android";
Expand Down Expand Up @@ -120,7 +126,7 @@ const tvosTargets: { [key: string]: Target } = GRAPHITE
args: [
[
"extra_cflags",
`["-target", "arm64-apple-tvos", "-mappletvos-version-min=${appleMinTarget}"]`,
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}, "-target", "arm64-apple-tvos", "-mappletvos-version-min=${appleMinTarget}"]`,
],
[
"extra_asmflags",
Expand All @@ -139,7 +145,7 @@ const tvosTargets: { [key: string]: Target } = GRAPHITE
["ios_use_simulator", true],
[
"extra_cflags",
`["-target", "arm64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}, "-target", "arm64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
],
[
"extra_asmflags",
Expand All @@ -158,15 +164,15 @@ const tvosTargets: { [key: string]: Target } = GRAPHITE
["ios_use_simulator", true],
[
"extra_cflags",
`["-target", "arm64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}, "-target", "x86_64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
],
[
"extra_asmflags",
`["-target", "arm64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
`["-target", "x86_64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
],
[
"extra_ldflags",
`["-target", "arm64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
`["-target", "x86_64-apple-tvos-simulator", "-mappletvsimulator-version-min=${appleSimulatorMinTarget}"]`,
],
],
},
Expand All @@ -184,7 +190,7 @@ const maccatalystTargets: { [key: string]: Target } = MACCATALYST
["target_cpu", `"arm64"`],
[
"extra_cflags",
`["-target","arm64-apple-ios14.0-macabi",` +
`["-fexceptions","-frtti"${PATH_EDIT_FLAG ? `,"${PATH_EDIT_FLAG}"` : ""},"-target","arm64-apple-ios14.0-macabi",` +
`"-isysroot","${appleSdkRoot}",` +
`"-isystem","${appleSdkRoot}/System/iOSSupport/usr/include",` +
`"-iframework","${appleSdkRoot}/System/iOSSupport/System/Library/Frameworks"]`,
Expand All @@ -206,7 +212,7 @@ const maccatalystTargets: { [key: string]: Target } = MACCATALYST
["target_cpu", `"x64"`],
[
"extra_cflags",
`["-target","x86_64-apple-ios14.0-macabi",` +
`["-fexceptions","-frtti"${PATH_EDIT_FLAG ? `,"${PATH_EDIT_FLAG}"` : ""},"-target","x86_64-apple-ios14.0-macabi",` +
`"-isysroot","${appleSdkRoot}",` +
`"-isystem","${appleSdkRoot}/System/iOSSupport/usr/include",` +
`"-iframework","${appleSdkRoot}/System/iOSSupport/System/Library/Frameworks"]`,
Expand Down Expand Up @@ -256,7 +262,7 @@ export const configurations = {
["cxx", '"clang++"'],
[
"extra_cflags",
'["-DSKIA_C_DLL", "-DHAVE_SYSCALL_GETRANDOM", "-DXML_DEV_URANDOM"]',
`["-DSKIA_C_DLL", "-DHAVE_SYSCALL_GETRANDOM", "-DXML_DEV_URANDOM"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}]`,
],
...ParagraphArgsAndroid,
],
Expand All @@ -276,32 +282,60 @@ export const configurations = {
"arm64-iphoneos": {
cpu: "arm64",
platform: "ios",
args: [["ios_min_target", `"${appleMinTarget}"`]],
args: [
["ios_min_target", `"${appleMinTarget}"`],
[
"extra_cflags",
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}]`,
],
],
},
"arm64-iphonesimulator": {
cpu: "arm64",
platform: "ios",
args: [
["ios_min_target", `"${appleSimulatorMinTarget}"`],
["ios_use_simulator", true],
[
"extra_cflags",
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}]`,
],
],
},
"x64-iphonesimulator": {
cpu: "x64",
platform: "ios",
args: [["ios_min_target", `"${appleSimulatorMinTarget}"`]],
args: [
["ios_min_target", `"${appleSimulatorMinTarget}"`],
[
"extra_cflags",
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}]`,
],
],
},
...tvosTargets,
...maccatalystTargets,
"arm64-macosx": {
platformGroup: "macosx",
cpu: "arm64",
platform: "mac",
args: [
[
"extra_cflags",
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}]`,
],
],
},
"x64-macosx": {
platformGroup: "macosx",
cpu: "x64",
platform: "mac",
args: [
[
"extra_cflags",
`["-fexceptions", "-frtti"${PATH_EDIT_FLAG ? `, "${PATH_EDIT_FLAG}"` : ""}]`,
],
],
},
},
args: [
Expand Down
Loading