Differential D38165 Diff 118368 www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_compiler.gni
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_compiler.gni
| --- src/3rdparty/chromium/build/config/compiler/compiler.gni.orig 2020-11-07 01:22:36 UTC | --- src/3rdparty/chromium/build/config/compiler/compiler.gni.orig 2021-12-15 16:12:54 UTC | ||||
| +++ src/3rdparty/chromium/build/config/compiler/compiler.gni | +++ src/3rdparty/chromium/build/config/compiler/compiler.gni | ||||
| @@ -47,7 +47,7 @@ declare_args() { | @@ -195,7 +195,7 @@ declare_args() { | ||||
| # only two architectures that are currently checked in). Turn this off when | |||||
| # you are using a custom toolchain and need to control -B in cflags. | |||||
| linux_use_bundled_binutils = | |||||
| - linux_use_bundled_binutils_override && is_linux && | |||||
| + linux_use_bundled_binutils_override && (is_linux && !is_bsd) && | |||||
| (current_cpu == "x64" || current_cpu == "x86") | |||||
| binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", | |||||
| root_build_dir) | |||||
| @@ -193,7 +193,7 @@ declare_args() { | |||||
| declare_args() { | declare_args() { | ||||
| # Whether to use the gold linker from binutils instead of lld or bfd. | # Whether to use the gold linker from binutils instead of lld or bfd. | ||||
| use_gold = | use_gold = | ||||
| - !use_lld && !(is_chromecast && is_linux && | - !use_lld && !(is_chromecast && is_linux && | ||||
| + !is_bsd && !use_lld && !(is_chromecast && is_linux && | + !is_bsd && !use_lld && !(is_chromecast && is_linux && | ||||
| (current_cpu == "arm" || current_cpu == "mipsel")) && | (current_cpu == "arm" || current_cpu == "mipsel")) && | ||||
| ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || | ((is_linux && (current_cpu == "x64" || current_cpu == "x86" || | ||||
| current_cpu == "arm" || current_cpu == "arm64" || | current_cpu == "arm" || current_cpu == "arm64" || | ||||