diff options
| author | Kacper Michajłow <kasper93@gmail.com> | 2023-07-24 14:03:19 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2023-07-24 19:44:34 +0200 |
| commit | ff3739b36e5b169ea948afbb30f73f34383248b3 (patch) | |
| tree | e632b6ca84fb54c4e8181f4bc77dabe825e8318f /ci | |
| parent | 48eb77207bff01ae766a9fb33b4e4c35cfad62c9 (diff) | |
| download | mpv-ff3739b36e5b169ea948afbb30f73f34383248b3.tar.bz2 mpv-ff3739b36e5b169ea948afbb30f73f34383248b3.tar.xz | |
ci/mingw: update luajit to fix i686 crashes
2.1.0-beta3 is ancient. Disable unwinding in luajit, as it requires SEH
to be enabled in the image, but it is not on i686 target and it
crashes when luajit tries to use SEH.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-mingw64.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index 5dadcde646..3455a8c792 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -177,14 +177,14 @@ fi ## luajit if [ ! -e "$prefix_dir/lib/libluajit-5.1.a" ]; then - ver=2.1.0-beta3 - gettar "http://luajit.org/download/LuaJIT-${ver}.tar.gz" - pushd LuaJIT-${ver} + $gitclone https://github.com/LuaJIT/LuaJIT.git + pushd LuaJIT hostcc=cc - [[ "$TARGET" == "i686-"* ]] && hostcc="$hostcc -m32" + flags= + [[ "$TARGET" == "i686-"* ]] && { hostcc="$hostcc -m32"; flags=XCFLAGS=-DLUAJIT_NO_UNWIND; } make TARGET_SYS=Windows clean make TARGET_SYS=Windows HOST_CC="$hostcc" CROSS=$TARGET- \ - BUILDMODE=static amalg + BUILDMODE=static $flags amalg make DESTDIR="$prefix_dir" INSTALL_DEP= FILE_T=luajit.exe install popd fi |