11diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
2- index 8e0c3761f..0031b3c42 100644
2+ index 147226d..7e0dfe0 100644
33--- a/config/BUILDCONFIG.gn
44+++ b/config/BUILDCONFIG.gn
55@@ -135,6 +135,9 @@ declare_args() {
@@ -12,7 +12,7 @@ index 8e0c3761f..0031b3c42 100644
1212 # Set to true when compiling with the Clang compiler.
1313 is_clang = current_os != "linux" ||
1414 (current_cpu != "s390x" && current_cpu != "s390" &&
15- @@ -247 ,7 +250 ,9 @@ if (target_os == "android") {
15+ @@ -255 ,7 +258 ,9 @@ if (target_os == "android") {
1616 _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
1717 } else if (target_os == "chromeos" || target_os == "linux") {
1818 # See comments in build/toolchain/cros/BUILD.gn about board compiles.
@@ -24,15 +24,15 @@ index 8e0c3761f..0031b3c42 100644
2424 } else {
2525 _default_toolchain = "//build/toolchain/linux:$target_cpu"
2626diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
27- index f58320b88..858fd54cc 100644
27+ index 5103543..eac7af8 100644
2828--- a/config/compiler/BUILD.gn
2929+++ b/config/compiler/BUILD.gn
30- @@ -369 ,7 +369 ,7 @@ config("compiler") {
30+ @@ -394 ,7 +394 ,7 @@ config("compiler") {
3131 }
3232 } else if (is_chromeos) {
3333 cflags += [ "-fstack-protector-strong" ]
34- - } else if (( is_posix && !is_nacl) || is_fuchsia) {
35- + } else if ((is_posix && !is_nacl && ! is_musl) || is_fuchsia) {
34+ - } else if (is_posix || is_fuchsia) {
35+ + } else if ((is_posix && !is_musl) || is_fuchsia) {
3636 if (current_os != "aix") {
3737 # Not available on aix.
3838 cflags += [ "-fstack-protector" ]
0 commit comments