From e0d729782261e1c21db983c898c4ac26454617b8 Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Sun, 10 Mar 2024 15:38:28 +0100 Subject: [PATCH] Musl: update patch https://chromium.googlesource.com/chromium/src/build/+/ee2c24e99f79ca8f7ce16adf7aa89597aeac4816 --- patches/musl/build.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/musl/build.patch b/patches/musl/build.patch index b725dfd7..fb6d227f 100644 --- a/patches/musl/build.patch +++ b/patches/musl/build.patch @@ -1,5 +1,5 @@ diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn -index 105e194..53dd476 100644 +index 894e82b45..2efa618ae 100644 --- a/config/BUILDCONFIG.gn +++ b/config/BUILDCONFIG.gn @@ -135,6 +135,9 @@ declare_args() { @@ -24,15 +24,15 @@ index 105e194..53dd476 100644 } else { _default_toolchain = "//build/toolchain/linux:$target_cpu" diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn -index 21683ac..fbf9764 100644 +index 3c7b4d82d..bc5a453e8 100644 --- a/config/compiler/BUILD.gn +++ b/config/compiler/BUILD.gn -@@ -375,7 +375,7 @@ config("compiler") { - # TODO(phajdan.jr): Use -fstack-protector-strong when our gcc supports it. - # See also https://crbug.com/533294 - # The x86 toolchain currently has problems with stack-protector. -- if (is_android && current_cpu == "x86") { -+ if ((is_android || is_musl) && current_cpu == "x86") { - cflags += [ "-fno-stack-protector" ] - } else if (current_os != "aix") { +@@ -379,7 +379,7 @@ config("compiler") { + } else { + cflags += [ "-fstack-protector" ] + } +- } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) { ++ } else if ((is_posix && !is_chromeos && !is_nacl && !is_musl) || is_fuchsia) { + if (current_os != "aix") { # Not available on aix. + cflags += [ "-fstack-protector" ]