Skip to content

Commit 332f68f

Browse files
committed
release: contrib/release/build.sh - only use named_recipe on win32 & win64 targets
1 parent 3f272d6 commit 332f68f

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

contrib/release/build.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@
7171
# -winlibs-gcc-10.2.0 (winlibs mingwrt 8.0.0r8)
7272
# -winlibs-gcc-10.3.0 (winlibs mingwrt 8.0.0r1)
7373
# -equation-gcc-8.3.0 (Equation - experimental)
74-
# --use-libffi-cache"
75-
# don't build libffi, just use the cached files, from the last build
7674
#
7775
# Requirements:
7876
# - MSYS environment on Windows with: bash, wget/curl, zip, unzip, patch, make, findutils
@@ -87,12 +85,10 @@
8785
# - Starting from scratch everytime => clean builds
8886
# - Specifying the exact DJGPP/MinGW packages to use => reproducible builds
8987
# - Only work locally, e.g. don't touch existing DJGPP/MinGW setups on the host
90-
# - automatically pull in binaries that need to be distributed with the standalone packages
9188
#
9289
# TODO:
9390
# - win32: fbdoc CHM
9491
# - package libffi
95-
# - automate combining packages
9692
#
9793
set -e
9894

@@ -115,8 +111,7 @@ usage() {
115111
echo " --remote name specify the name to use for the alternate remote"
116112
echo " --recipe name specify a build recipe to use"
117113
echo " --use-libffi-cache"
118-
echo " don't build libffi, just use the cached files"
119-
echo " from the last build"
114+
echo " don't build libffi, just use the chaced files"
120115
exit 1
121116
}
122117

@@ -186,7 +181,14 @@ if [ ! -z "$recipe_name" ]; then
186181
else
187182
# if no recipe given, set the default recipe for the main package
188183
user_recipe=
189-
named_recipe=-winlibs-gcc-9.3.0
184+
case "$target" in
185+
win32|win64)
186+
named_recipe=-winlibs-gcc-9.3.0
187+
;;
188+
*)
189+
named_recipe=
190+
;;
191+
esac
190192
fi
191193

192194
echo "building FB-$target (uname = `uname`, uname -m = `uname -m`)"

readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
- FreeBASIC-x.xx.x-win64.zip or FreeBASIC-x.xx.x-win64.7z for 64-bit
4141
Combined 32-bit and 64-bit standalone packages:
4242
Download and extract latest:
43-
- FreeBASIC-x.xx.x-gcc-winlibs-9.3.0.7z or
43+
- FreeBASIC-x.xx.x-winlibs-gcc-9.3.0.7z or
4444
- FreeBASIC-x.xx.x-gcc-5.2.0.7z
4545
- fbc32.exe and fbc64.exe are used instead of fbc.exe
4646

0 commit comments

Comments
 (0)