[openssl] Fix error in msys call to perform the perl installation.

microsoft · Aug 1, 2017 · 9a87ee9 · 9a87ee9
1 parent 5e9ac8a
commit 9a87ee9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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})
 ## ```