mirror of
https://git.freebsd.org/ports.git
synced 2025-06-21 04:30:37 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
20 lines
954 B
Text
20 lines
954 B
Text
--- build/config/allocator.gni.orig 2019-03-11 22:00:52 UTC
|
|
+++ build/config/allocator.gni
|
|
@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni")
|
|
|
|
# Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors.
|
|
if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan ||
|
|
- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) {
|
|
+ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) {
|
|
_default_allocator = "none"
|
|
} else {
|
|
_default_allocator = "tcmalloc"
|
|
@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls
|
|
# against the debug CRT with "is_nacl=false".
|
|
if ((is_linux || is_android || is_mac ||
|
|
(is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan &&
|
|
- !is_tsan && !is_msan) {
|
|
+ !is_tsan && !is_msan && !is_bsd) {
|
|
_default_use_allocator_shim = true
|
|
} else {
|
|
_default_use_allocator_shim = false
|