diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-02-08 17:39:31 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-02-08 17:39:31 -0800 |
| commit | 116b1b8c66afbe11719c42d03d342bb6fe5d58b0 (patch) | |
| tree | 54e2a615689a57732c78f79da12c75f52d9ae3c3 /ports/openssl | |
| parent | 52ebf3944d1a0aa276472f50e47de9fa61429a7c (diff) | |
| download | vcpkg-116b1b8c66afbe11719c42d03d342bb6fe5d58b0.tar.gz vcpkg-116b1b8c66afbe11719c42d03d342bb6fe5d58b0.zip | |
Reorder path alterations to generally append instead of prepend.
This solves the issue where some software bundles (git) provide multiple executables in the same folder, which can override other desired programs (link.exe).
Diffstat (limited to 'ports/openssl')
| -rw-r--r-- | ports/openssl/portfile-uwp.cmake | 2 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/openssl/portfile-uwp.cmake b/ports/openssl/portfile-uwp.cmake index 289c549fc..cf2f1e7ca 100644 --- a/ports/openssl/portfile-uwp.cmake +++ b/ports/openssl/portfile-uwp.cmake @@ -30,7 +30,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2k_WinRT) vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -set(ENV{PATH} "${PERL_EXE_PATH};$ENV{PATH}") +set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") vcpkg_download_distfile(ARCHIVE URLS "https://github.com/Microsoft/openssl/archive/OpenSSL_1_0_2k_WinRT.zip" diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index b13258119..042278943 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_find_acquire_program(PERL) find_program(NMAKE nmake) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -set(ENV{PATH} "${PERL_EXE_PATH};$ENV{PATH}") +set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}") vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" |
