diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-01 16:03:40 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-01 16:03:40 -0700 |
| commit | 9a87ee9c9dc655dccb4e7b927279c9094f960448 (patch) | |
| tree | 7b2058da8c9ec90f2ace42198917de029cd83f82 | |
| parent | 5e9ac8a25bee0eb074f139bc73ed8e2a3755fc2d (diff) | |
| download | vcpkg-9a87ee9c9dc655dccb4e7b927279c9094f960448.tar.gz vcpkg-9a87ee9c9dc655dccb4e7b927279c9094f960448.zip | |
[openssl] Fix error in msys call to perform the perl installation.
| -rw-r--r-- | ports/openssl/portfile-uwp.cmake | 13 | ||||
| -rw-r--r-- | ports/openssl/portfile.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_acquire_msys.cmake | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ports/openssl/portfile-uwp.cmake b/ports/openssl/portfile-uwp.cmake index e1f7a7932..455cd927d 100644 --- a/ports/openssl/portfile-uwp.cmake +++ b/ports/openssl/portfile-uwp.cmake @@ -29,9 +29,20 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-OpenSSL_1_0_2l_WinRT) -vcpkg_find_acquire_program(PERL) vcpkg_find_acquire_program(JOM) get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) + +vcpkg_acquire_msys(MSYS_ROOT) +set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + +vcpkg_execute_required_process( + COMMAND ${BASH} --noprofile --norc -c 'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed perl' + WORKING_DIRECTORY ${MSYS_ROOT} + LOGNAME pacman-${TARGET_TRIPLET} +) + +set(PERL ${MSYS_ROOT}/usr/bin/perl.exe) + get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH};${JOM_EXE_PATH}") diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 45417e4eb..e5a3699f0 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_acquire_msys(MSYS_ROOT) set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc -c "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed perl" + COMMAND ${BASH} --noprofile --norc -c 'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed perl' WORKING_DIRECTORY ${MSYS_ROOT} LOGNAME pacman-${TARGET_TRIPLET} ) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 905952eab..87c34c274 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -32,7 +32,7 @@ ## vcpkg_execute_required_process( ## COMMAND ## ${BASH} --noprofile --norc -c -## "PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed make" +## 'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed make' ## WORKING_DIRECTORY ${MSYS_ROOT} ## LOGNAME pacman-${TARGET_TRIPLET}) ## ``` |