diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni')
| -rw-r--r-- | www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni b/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni index 35a3ed70322a..d8533c2d1fb9 100644 --- a/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni +++ b/www/iridium/files/patch-components_gwp__asan_buildflags_buildflags.gni @@ -1,14 +1,16 @@ ---- components/gwp_asan/buildflags/buildflags.gni.orig 2025-05-07 06:48:23 UTC +--- components/gwp_asan/buildflags/buildflags.gni.orig 2025-11-06 10:11:34 UTC +++ components/gwp_asan/buildflags/buildflags.gni -@@ -10,10 +10,7 @@ import("//build/config/compiler/compiler.gni") - # Android component builds are disabled due to https://crbug.com/976399 +@@ -11,10 +11,10 @@ import("//build/config/compiler/compiler.gni") # Android requires frame pointers for unwinding, unwind tables aren't shipped in # official builds. + # iOS is disabled when !use_partition_alloc due to https://crbug.com/446856826 -supported_platform = -- is_linux || is_chromeos || is_mac || is_ios || -- (is_win && (current_cpu == "x64" || current_cpu == "arm64")) || +- is_linux || is_chromeos || is_mac || (is_ios && use_partition_alloc) || ++supported_platform = !is_bsd && ++ (is_linux || is_chromeos || is_mac || (is_ios && use_partition_alloc) || + (is_win && (current_cpu == "x64" || current_cpu == "arm64")) || - (is_android && !is_component_build && enable_frame_pointers) -+supported_platform = false ++ (is_android && !is_component_build && enable_frame_pointers)) declare_args() { # Is GWP-ASan malloc/PartitionAlloc hooking enabled for chrome/ on a given |