From e70cf826257b913deb7fd90f9b8a8982941a8558 Mon Sep 17 00:00:00 2001
From: teor <teor@torproject.org>
Date: Wed, 5 Sep 2018 18:32:46 +1000
Subject: Appveyor: Disable gcc hardening in Windows 64-bit builds

As of August 29, 2018, Appveyor images come with gcc 8.2.0 by
default. 64-bit Windows executables compiled with gcc 8.2.0 and
tor's --enable-gcc-hardening crash.

Fixes bug 27460; bugfix on 0.3.4.1-alpha.
---
 .appveyor.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.appveyor.yml')

diff --git a/.appveyor.yml b/.appveyor.yml
index 690f93e5b6..cb8446f430 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,9 +9,11 @@ environment:
   - target: i686-w64-mingw32
     compiler_path: mingw32
     openssl_path: /c/OpenSSL-Win32
+    hardening:
   - target: x86_64-w64-mingw32
     compiler_path: mingw64
     openssl_path: /c/OpenSSL-Win64
+    hardening: --disable-gcc-hardening
 
 install:
 - ps: >-
@@ -41,7 +43,7 @@ build_script:
             Set-Location "${env:build}"
             Execute-Bash "which ${env:target}-gcc"
             Execute-Bash "${env:target}-gcc --version"
-            Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path}"
+            Execute-Bash "../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings --with-openssl-dir=${env:openssl_path} ${env:hardening}"
             Execute-Bash "V=1 make -j2"
             Execute-Bash "V=1 make -j2 install"
      }
-- 
cgit v1.2.3-54-g00ecf