diff options
| author | Alexander Færøy <ahf@torproject.org> | 2018-11-27 02:35:44 +0100 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2018-11-27 14:53:50 +0100 |
| commit | 36c32355349bff091b92c04be2823d96feebd5c6 (patch) | |
| tree | a1a99b8364654ac4b406eac95ed5cfe0a1b3b8b9 /.appveyor.yml | |
| parent | 9da8cd0bc35920bc1492efd3312d05f147fc7f7e (diff) | |
| download | tor-36c32355349bff091b92c04be2823d96feebd5c6.tar.gz tor-36c32355349bff091b92c04be2823d96feebd5c6.zip | |
Explicitly specify path to OpenSSL for Appveyor.
This patch explicitly specifies the path to our OpenSSL dependency and
disables the installation of an external OpenSSL version and instead
uses the OpenSSL version available from the MinGW environments.
See: https://bugs.torproject.org/28574
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 0bb93316f5..34e1c8b846 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -34,7 +34,7 @@ install: # # Use pacman --debug to show package downloads and install locations #> - Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-openssl ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; + Execute-Command "C:\msys64\usr\bin\pacman" -Sy --verbose --needed --noconfirm ${env:mingw_prefix}-libevent ${env:mingw_prefix}-pkg-config ${env:mingw_prefix}-xz ${env:mingw_prefix}-zstd ; build_script: - ps: >- @@ -54,7 +54,7 @@ build_script: # mingw zstd doesn't come with a pkg-config file, so we manually # configure its flags. liblzma just works. #> - Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" + Execute-Bash "ZSTD_CFLAGS='-L/${env:compiler_path}/include' ZSTD_LIBS='-L/${env:compiler_path}/lib -lzstd' ../configure --prefix=/${env:compiler_path} --build=${env:target} --host=${env:target} --with-openssl-dir=/${env:compiler_path} --disable-asciidoc --enable-fatal-warnings ${env:hardening}" Execute-Bash "V=1 make -j2" Execute-Bash "V=1 make -j2 install" } |