Merge pull request #59740 from bruvzg/brotli_san

2022-03-31 17:32:24 +02:00
parent fda87d4a89 4d9689e7f6
commit c5f9424fbd
1 changed files with 3 additions and 0 deletions
--- a/modules/freetype/SCsub
+++ b/modules/freetype/SCsub
@@ -74,6 +74,9 @@ if env["builtin_freetype"]:
    env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
    env_freetype.Prepend(CPPPATH=[thirdparty_brotli_dir + "include"])

+    if env.get("use_ubsan") or env.get("use_asan") or env.get("use_tsan") or env.get("use_lsan") or env.get("use_msan"):
+        env_freetype.Append(CPPDEFINES=["BROTLI_BUILD_PORTABLE"])
+
    if env["platform"] == "uwp":
        # Include header for UWP to fix build issues
        env_freetype.Append(CCFLAGS=["/FI", '"modules/freetype/uwpdef.h"'])