fix: enable_safe_libstdcxxの未定義修正パッチ追加

Signed-off-by: Zenichi Amano <[email protected]>
crow-misia · Mar 24, 2024 · 77dd88f · 77dd88f
1 parent 1b02390
commit 77dd88f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/build/linux-arm/Makefile b/build/linux-arm/Makefile
@@ -38,7 +38,8 @@ patch: common-patch
 	cd $(SRC_DIR) && \
 	patch -p2 < $(PATCH_DIR)/4k_linux.patch && \
 	patch -p2 < $(PATCH_DIR)/disable_use_hermetic_xcode_on_linux.patch && \
-	patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch
+	patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch && \
+	patch -p2 < $(PATCH_DIR)/linux_fix_enable_safe_libstdcxx.patch
 
 .PHONY: build
 build: download patch

diff --git a/build/linux-arm64/Makefile b/build/linux-arm64/Makefile
@@ -38,7 +38,8 @@ patch: common-patch
 	cd $(SRC_DIR) && \
 	patch -p2 < $(PATCH_DIR)/4k_linux.patch && \
 	patch -p2 < $(PATCH_DIR)/disable_use_hermetic_xcode_on_linux.patch && \
-	patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch
+	patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch && \
+	patch -p2 < $(PATCH_DIR)/linux_fix_enable_safe_libstdcxx.patch
 
 .PHONY: build
 build: download patch

diff --git a/build/linux-x64/Makefile b/build/linux-x64/Makefile
@@ -38,7 +38,8 @@ patch: common-patch
 	cd $(SRC_DIR) && \
 	patch -p2 < $(PATCH_DIR)/4k_linux.patch && \
 	patch -p2 < $(PATCH_DIR)/disable_use_hermetic_xcode_on_linux.patch && \
-	patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch
+	patch -p2 < $(PATCH_DIR)/linux_clang_optional.patch && \
+	patch -p2 < $(PATCH_DIR)/linux_fix_enable_safe_libstdcxx.patch
 
 .PHONY: build
 build: download patch

diff --git a/patch/linux_fix_enable_safe_libstdcxx.patch b/patch/linux_fix_enable_safe_libstdcxx.patch
@@ -0,0 +1,10 @@
+--- a/src/build_overrides/build.gni
++++ b/src/build_overrides/build.gni
+@@ -11,6 +11,7 @@ enable_java_templates = true
+
+ # Enables assertions on safety checks in libc++.
+ enable_safe_libcxx = true
++enable_safe_libstdcxx = true
+
+ # Don't set this variable to true when building stadalone WebRTC, it is
+ # only needed to support both WebRTC standalone and Chromium builds.