Skip to content

Commit f8e3fdd

Browse files
committed
7-zip-build: fix downloading busybox
1 parent b4eb88c commit f8e3fdd

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

7-zip-build.bat

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ call :Download https://www.7-zip.org/a/%version%-src.7z %version%-src.7z
2727

2828
:Patch
2929
if defined APPVEYOR goto :Patch_Appveyor
30-
busybox 2>nul >nul || call :Download https://frippery.org/files/busybox/busybox.exe
30+
busybox 2>nul >nul || call :Download https://frippery.org/files/busybox/busybox.exe busybox.exe
3131
busybox sh 7-zip-patch.sh
3232
goto :Patch_Done
3333

@@ -39,15 +39,15 @@ C:\msys64\usr\bin\bash -lc "cd \"$APPVEYOR_BUILD_FOLDER\" && exec ./7-zip-patch.
3939
:Init_VC_LTL
4040
git clone https://github.com/Chuyu-Team/VC-LTL.git --depth=1
4141
set "VC_LTL_PATH=%CD%\VC-LTL"
42-
set "CL_VER=14.0.24210"
42+
set "VC_VER=14.0.24210"
4343
set "SDK_VER=10.0.10240.0"
4444

4545
:Env_x64
4646
call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" amd64
4747
set BITS=x64
48-
set "PATH=%VC_LTL_PATH%;%VC_LTL_PATH%\VC\%CL_VER%\include;%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%CL_VER%\lib\%BITS%;%PATH%"
49-
set "INCLUDE=%VC_LTL_PATH%\VC\%CL_VER%\include;%INCLUDE%"
50-
set "LIB=%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%CL_VER%\lib\%BITS%;%VC_LTL_PATH%\ucrt\%SDK_VER%\lib\%BITS%;%LIB%"
48+
set "PATH=%VC_LTL_PATH%;%VC_LTL_PATH%\VC\%VC_VER%\include;%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%VC_VER%\lib\%BITS%;%PATH%"
49+
set "INCLUDE=%VC_LTL_PATH%\VC\%VC_VER%\include;%INCLUDE%"
50+
set "LIB=%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%VC_VER%\lib\%BITS%;%VC_LTL_PATH%\ucrt\%SDK_VER%\lib\%BITS%;%LIB%"
5151

5252
:Build_x64
5353
cd CPP\7zip
@@ -65,9 +65,9 @@ nmake /F makefile_con NEW_COMPILER=1 CPU=AMD64
6565
:Env_x86
6666
call "%VS140COMNTOOLS%\vsvars32.bat"
6767
set BITS=x86
68-
set "PATH=%VC_LTL_PATH%;%VC_LTL_PATH%\VC\%CL_VER%\include;%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%CL_VER%\lib\%BITS%;%PATH%"
69-
set "INCLUDE=%VC_LTL_PATH%\VC\%CL_VER%\include;%INCLUDE%"
70-
set "LIB=%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%CL_VER%\lib\%BITS%;%VC_LTL_PATH%\ucrt\%SDK_VER%\lib\%BITS%;%LIB%"
68+
set "PATH=%VC_LTL_PATH%;%VC_LTL_PATH%\VC\%VC_VER%\include;%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%VC_VER%\lib\%BITS%;%PATH%"
69+
set "INCLUDE=%VC_LTL_PATH%\VC\%VC_VER%\include;%INCLUDE%"
70+
set "LIB=%VC_LTL_PATH%\%BITS%;%VC_LTL_PATH%\VC\%VC_VER%\lib\%BITS%;%VC_LTL_PATH%\ucrt\%SDK_VER%\lib\%BITS%;%LIB%"
7171

7272
:Build_x86
7373
nmake NEW_COMPILER=1

0 commit comments

Comments
 (0)