@@ -624,11 +624,12 @@ const setRuby = (_ruby) => {
624624
625625const run = async ( ) => {
626626 try {
627+ // 2020-04-01 setup-ruby sets ENV['MAKE'], not needed
627628 // rename files that cause build conflicts with MSYS2
628- let badFiles = [ 'C:\\Strawberry\\c\\bin\\gmake.exe' ]
629- badFiles . forEach ( ( bad ) => {
630- if ( fs . existsSync ( bad ) ) { fs . renameSync ( bad , `${ bad } _` ) }
631- } )
629+ // let badFiles = ['C:\\Strawberry\\c\\bin\\gmake.exe']
630+ // badFiles.forEach( (bad) => {
631+ // if (fs.existsSync(bad)) { fs.renameSync(bad, `${bad}_`) }
632+ // })
632633
633634 if ( mingw !== '' || msys2 !== '' ) {
634635 if ( ruby . abiVers >= '2.4.0' ) {
@@ -1736,13 +1737,14 @@ const run = async () => {
17361737 execSync ( `choco install --no-progress ${ choco } ` )
17371738 if ( choco . includes ( 'openssl' ) ) {
17381739 fs . renameSync ( 'C:\\Program Files\\OpenSSL-Win64' , 'C:\\openssl-win' )
1739- core . exportVariable ( 'SSL_DIR' , '--with-openssl-dir=C:\\ openssl-win' )
1740+ core . exportVariable ( 'SSL_DIR' , '--with-openssl-dir=C:/ openssl-win' )
17401741 }
17411742 }
17421743
17431744 if ( vcpkg !== '' ) {
17441745 execSync ( `vcpkg --triplet x64-windows install ${ vcpkg } ` )
1745- core . exportVariable ( 'OPT_DIR' , `--with-opt-dir=${ process . env . VCPKG_INSTALLATION_ROOT } \\installed\\x64-windows` )
1746+ const vcpkgRoot = process . env . VCPKG_INSTALLATION_ROOT . replace ( / \\ / g, '/' )
1747+ core . exportVariable ( 'OPT_DIR' , `--with-opt-dir=${ vcpkgRoot } /installed/x64-windows` )
17461748 const vcpkgTools = `${ process . env . VCPKG_INSTALLATION_ROOT } \\installed\\x64-windows\\tools`
17471749 if ( fs . existsSync ( vcpkgTools ) && fs . readdirSync ( vcpkgTools ) . length >= 0 ) {
17481750 core . addPath ( vcpkgTools )
0 commit comments