[tbb-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] Revert "libssp test"

[gk at torproject.org]

commit 672bd49039cafa175f37b5bb3eaf850271e8a3a0
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Sep 23 16:00:33 2019 +0000

    Revert "libssp test"
    
    This reverts commit c153996e3cbc072eb2ae68ae5c532848b1ac9c3b.
---
 build/moz.configure/toolchain.configure | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 3bcf403bceec..68364075f006 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1676,10 +1676,12 @@ def security_hardening_cflags(hardening_flag, asan, optimize, c_compiler, target
         # Enable only if hardening is not disabled and ASAN is
         # not on as ASAN will catch the crashes for us
         if compiler_is_gccish and not asan:
-            flags.append("-fstack-protector-strong")
-            ldflags.append("-fstack-protector-strong")
-            js_flags.append("-fstack-protector-strong")
-            js_ldflags.append("-fstack-protector-strong")
+            # mingw-clang cross-compile toolchain has bugs with stack protector
+            if target.os != 'WINNT' or c_compiler == 'gcc':
+                flags.append("-fstack-protector-strong")
+                ldflags.append("-fstack-protector-strong")
+                js_flags.append("-fstack-protector-strong")
+                js_ldflags.append("-fstack-protector-strong")
 
         # ASLR ------------------------------------------------
         # ASLR (dynamicbase) is enabled by default in clang-cl; but the