diff --git a/build/linux-arm/Makefile b/build/linux-arm/Makefile index 7eee4ac2..1eb5af8b 100644 --- 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 index 03c3a465..49e86c1a 100644 --- 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 index 6fb2a4e0..bae3ce1b 100644 --- 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 new file mode 100644 index 00000000..10948b00 --- /dev/null +++ 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.