Skip to content

Commit 9bfa840

Browse files
committed
fbc-1.10: contrib/release/build.sh
- revert libffi to version 3.3 for 32-bit - libffi fails to compile in the 32-bit builds
1 parent 397a31e commit 9bfa840

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

contrib/release/build.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
#
6060
# --recipe name
6161
# specify which build recipe to use. Not all recipes are supported on all targets.
62-
# -gcc-5.2.0 (mingw-w64 project)
62+
# * -gcc-5.2.0 (mingw-w64 project)
6363
# -gcc-7.1.0 (mingw-w64 project)
6464
# -gcc-7.1.0r0 (mingw-w64 project)
6565
# -gcc-7.1.0r2 (mingw-w64 project)
6666
# -gcc-7.3.0 (mingw-w64 project)
6767
# -gcc-8.1.0 (mingw-w64 project)
68-
# -gcc-11.2.0 (mingw-w64 project)
68+
# * -gcc-11.2.0 (mingw-w64 project)
6969
# -gcc-12.2.0 (mingw-w64 project)
70-
# -winlibs-gcc-9.3.0 (winlibs mingwrt 7.0.0r3 - sjlj)
70+
# * -winlibs-gcc-9.3.0 (winlibs mingwrt 7.0.0r3 - sjlj)
7171
# -winlibs-gcc-11.2.0 (winlibs mingwrt 10.0.0r1 - msvcrt)
7272
# -winlibs-gcc-11.3.0 (winlibs mingwrt 10.0.0r3 - msvcrt)
7373
# -winlibs-gcc-11.4.0 (winlibs mingwrt 11.0.0r1 - msvcrt)
@@ -548,7 +548,7 @@ get_windows_toolchain() {
548548
-equation-*)
549549
get_equation_toolchain $bits $arch
550550
;;
551-
-mingw-w64-gcc-11.2.0|-gcc-11.2.0|-mingw-w64-gcc-11.2.0|-gcc-12.2.0)
551+
-mingw-w64-gcc-11.2.0|-gcc-11.2.0|-mingw-w64-gcc-12.2.0|-gcc-12.2.0)
552552
get_nixman_toolchain $bits $arch
553553
;;
554554
-mingw-w64-gcc-*|-gcc-*)
@@ -717,7 +717,16 @@ linux*)
717717
esac
718718

719719
case $fbtarget in
720-
win32|win64)
720+
win32)
721+
# libffi sources https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz.
722+
libffi_title=libffi-3.3
723+
libffi_package="${libffi_title}.tar.gz"
724+
download "$libffi_package" "ftp://sourceware.org/pub/libffi/$libffi_package"
725+
echo "extracting $libffi_package"
726+
tar xf "../input/$libffi_package"
727+
;;
728+
729+
win64)
721730
# libffi sources:
722731
# - ftp://sourceware.org/pub/libffi/libffi-3.4.3.tar.gz
723732
# - https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz
@@ -975,7 +984,7 @@ windowsbuild() {
975984
;;
976985
esac
977986
;;
978-
-winlibs-gcc-9.3.0|-winlibs-gcc-10.2.0|-winlibs-gcc-10.3.0|-winlibs-gcc-11.2.0|-winlibs-gcc-11.3.0|-winlibs-gcc-11.4.0)
987+
-winlibs-gcc-9.3.0|-winlibs-gcc-10.2.0|-winlibs-gcc-10.3.0|-winlibs-gcc-11.3.0)
979988
# -winlibs-gcc-X.X is being built from winlibs and the binutils have a few dependencies
980989
# copy these to the bin directory - they go with the executables and should
981990
# not be used as general libraries

0 commit comments

Comments
 (0)