diff options
| author | Elliott Hughes <enh@google.com> | 2018-10-30 11:28:38 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-10-30 11:28:38 -0700 |
| commit | b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee (patch) | |
| tree | 24facefd22d2ca56694f740049660701da90ee9a /projects | |
| parent | 8c49d19ccbe7df4ce7b150f5d92eaddcc7f369df (diff) | |
| download | external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.tar.gz external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.tar.bz2 external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.zip | |
Update to curl 7.61.1 - September 5 2018.
Bug: N/A
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Ic8598fc9d0bc029640ea3cbcecf4820d1de8f6ae
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/build-openssl.bat | 33 | ||||
| -rw-r--r-- | projects/checksrc.bat | 2 |
2 files changed, 15 insertions, 20 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index 9fd49b78..98daff52 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -153,26 +153,21 @@ rem *************************************************************************** rem Check we have Visual Studio installed if not exist "%ABS_VC_PATH%" goto novc - if not defined PERL_PATH ( - rem Check we have Perl in our path - rem using !! below as %% was having \Microsoft was unexpected error. - echo !PATH! | findstr /I /C:"\Perl" 1>nul - if errorlevel 1 ( - rem It isn't so check we have it installed and set the path if it is - if exist "%SystemDrive%\Perl" ( - set "PATH=%SystemDrive%\Perl\bin;%PATH%" - ) else ( - if exist "%SystemDrive%\Perl64" ( - set "PATH=%SystemDrive%\Perl64\bin;%PATH%" - ) else ( - - - - goto noperl - ) - ) - ) + rem Check we have Perl in our path + perl --version <NUL 1>NUL 2>&1 + if errorlevel 1 ( + rem It isn't so check we have it installed and set the path if it is + if exist "%SystemDrive%\Perl" ( + set "PATH=%SystemDrive%\Perl\bin;%PATH%" + ) else ( + if exist "%SystemDrive%\Perl64" ( + set "PATH=%SystemDrive%\Perl64\bin;%PATH%" + ) else ( + goto noperl + ) + ) + ) ) else ( set "PATH=%PERL_PATH%\Perl\bin;%PATH%" ) diff --git a/projects/checksrc.bat b/projects/checksrc.bat index 3c38f50e..5c8debf1 100644 --- a/projects/checksrc.bat +++ b/projects/checksrc.bat @@ -73,7 +73,7 @@ rem *************************************************************************** :prerequisites rem Check we have Perl in our path - echo %PATH% | findstr /I /C:"\Perl" 1>nul + perl --version <NUL 1>NUL 2>&1 if errorlevel 1 ( rem It isn't so check we have it installed and set the path if it is if exist "%SystemDrive%\Perl" ( |