Skip to content

Commit

Permalink
Musl: update patch
Browse files Browse the repository at this point in the history
  • Loading branch information
bblanchon committed Mar 10, 2024
1 parent c480852 commit e0d7297
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions patches/musl/build.patch
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -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" ]

0 comments on commit e0d7297

Please sign in to comment.