@@ -457,9 +457,7 @@ def runStages():
457457
458458stage ('msys64' , """
459459win:
460- SET PATH_BACKUP_=%PATH%
461- SET PATH=%ROOT_DIR%\\ ThirdParty\\ msys64\\ usr\\ bin;%PATH%
462-
460+ SET PATH=%THIRDPARTY_DIR%\\ msys64\\ usr\\ bin;%PATH%
463461 SET CHERE_INVOKING=enabled_from_arguments
464462 SET MSYS2_PATH_TYPE=inherit
465463
@@ -475,8 +473,6 @@ def runStages():
475473 mingw-w64-x86_64-nasm ^
476474 mingw-w64-x86_64-perl ^
477475 mingw-w64-x86_64-pkgconf
478-
479- SET PATH=%PATH_BACKUP_%
480476""" , 'ThirdParty' )
481477
482478stage ('python' , """
@@ -730,7 +726,6 @@ def runStages():
730726winarm:
731727 SET "TARGET=aarch64"
732728 SET "DAV1D_ASM_DISABLE="
733- SET "PATH_BACKUP_=%PATH%"
734729 SET "PATH=%LIBS_DIR%\\ gas-preprocessor;%PATH%"
735730 echo armasm64 fails with 'syntax error in expression: tbnz x14, #4, 8f' as if this instruction is unknown/unsupported.
736731 git revert --no-edit d503bb0ccaf104b2f13da0f092e09cc9411b3297
@@ -759,8 +754,6 @@ def runStages():
759754win:
760755 copy %LIBS_DIR%\\ local\\ lib\\ libdav1d.a %LIBS_DIR%\\ local\\ lib\\ dav1d.lib
761756 deactivate
762- winarm:
763- SET "PATH=%PATH_BACKUP_%"
764757mac:
765758 buildOneArch() {
766759 arch=$1
@@ -795,7 +788,6 @@ def runStages():
795788 SET "TARGET=x86_64"
796789winarm:
797790 SET "TARGET=aarch64"
798- SET "PATH_BACKUP_=%PATH%"
799791 SET "PATH=%LIBS_DIR%\\ gas-preprocessor;%PATH%"
800792win:
801793 set FILE=cross-file.txt
@@ -822,8 +814,6 @@ def runStages():
822814win:
823815 copy %LIBS_DIR%\\ local\\ lib\\ libopenh264.a %LIBS_DIR%\\ local\\ lib\\ openh264.lib
824816 deactivate
825- winarm:
826- SET "PATH=%PATH_BACKUP_%"
827817mac:
828818 buildOneArch() {
829819 arch=$1
@@ -1057,9 +1047,7 @@ def runStages():
10571047win:
10581048 for /r %%i in (..\\ patches\\ libvpx\\ *) do git apply %%i
10591049
1060- SET PATH_BACKUP_=%PATH%
1061- SET PATH=%ROOT_DIR%\\ ThirdParty\\ msys64\\ usr\\ bin;%PATH%
1062-
1050+ SET PATH=%THIRDPARTY_DIR%\\ msys64\\ usr\\ bin;%PATH%
10631051 SET CHERE_INVOKING=enabled_from_arguments
10641052 SET MSYS2_PATH_TYPE=inherit
10651053
@@ -1072,8 +1060,6 @@ def runStages():
10721060win:
10731061depends:patches/build_libvpx_win.sh
10741062 bash --login ../patches/build_libvpx_win.sh
1075-
1076- SET PATH=%PATH_BACKUP_%
10771063mac:
10781064 find ../patches/libvpx -type f -print0 | sort -z | xargs -0 git apply
10791065
@@ -1167,9 +1153,7 @@ def runStages():
11671153depends:patches/ffmpeg.patch
11681154 git apply ../patches/ffmpeg.patch
11691155
1170- SET PATH_BACKUP_=%PATH%
1171- SET PATH=%ROOT_DIR%\\ ThirdParty\\ msys64\\ usr\\ bin;%PATH%
1172-
1156+ SET PATH=%THIRDPARTY_DIR%\\ msys64\\ usr\\ bin;%PATH%
11731157 SET CHERE_INVOKING=enabled_from_arguments
11741158 SET MSYS2_PATH_TYPE=inherit
11751159
@@ -1179,8 +1163,6 @@ def runStages():
11791163win:
11801164depends:patches/build_ffmpeg_win.sh
11811165 bash --login ../patches/build_ffmpeg_win.sh
1182-
1183- SET PATH=%PATH_BACKUP_%
11841166mac:
11851167 export PKG_CONFIG_PATH=$USED_PREFIX/lib/pkgconfig
11861168
0 commit comments