diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-07 08:48:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-07 08:48:23 -0400 |
| commit | 85cee6a749128b926cd727a5c0f2e516a260eb41 (patch) | |
| tree | 2517583319cf63515540db93ec26b6c7879f045a | |
| parent | b36f128cee5520ac37acafa0459c9bf14dedad5a (diff) | |
| parent | 967cef2f8f5ad654aa0d53e1516fd26bc18a00e8 (diff) | |
| download | tor-85cee6a749128b926cd727a5c0f2e516a260eb41.tar.gz tor-85cee6a749128b926cd727a5c0f2e516a260eb41.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -rw-r--r-- | .appveyor.yml | 4 | ||||
| -rw-r--r-- | changes/bug27460 | 6 |
2 files changed, 9 insertions, 1 deletions
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"
}
diff --git a/changes/bug27460 b/changes/bug27460 new file mode 100644 index 0000000000..53c4c7daf3 --- /dev/null +++ b/changes/bug27460 @@ -0,0 +1,6 @@ + o Minor bugfixes (continuous integration): + - Disable gcc hardening in Appveyor 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. |