Skip to content

Commit fb945e4

Browse files
committed
release: add linux-arm and linux-aarch64 targets
- update makefile to build linux-aarch64 and linux-arm targets - update build.sh to allow linux-aarch64 and linux-arm targets - choose 1.07.2 for bootstrap source on linux-aarch - choose 1.07.2 for bootstrap source on linux-arm (cherry picked from commit 8931f5d)
1 parent 03b72d4 commit fb945e4

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

contrib/release/build.sh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
# linux-x86_64
2626
# native builds on GNU/Linux x86/x64_64 - relying on the host toolchains;
2727
# no gcc toolchain is downloaded; no standalone version of FB is built.
28+
# linux-arm
29+
# linux-aarch64
30+
# native builds on GNU/arm/aarch64 - relying on the host toolchains;
31+
# no gcc toolchain is downloaded; no standalone version of FB is built.
2832
# win32
2933
# 32bit MinGW-w64 build: must run on Win32. Uses MSYS.
3034
# win32-mingworg
@@ -83,7 +87,7 @@
8387
set -e
8488

8589
usage() {
86-
echo "usage: ./build.sh dos|linux-x86|linux-x86_64|win32|win32-mingworg|win64 <fbc commit id> [--offline] [--repo url] [--remote name] [--recipe name]"
90+
echo "usage: ./build.sh dos|linux-x86|linux-x86_64|linux-arm|linux-aarch64|win32|win32-mingworg|win64 <fbc commit id> [--offline] [--repo url] [--remote name] [--recipe name]"
8791
exit 1
8892
}
8993

@@ -108,7 +112,7 @@ case $arg in
108112
recipe_name="$2"
109113
shift; shift
110114
;;
111-
dos|linux-x86|linux-x86_64|win32|win64)
115+
dos|linux-x86|linux-x86_64|win32|win64|linux-arm|linux-aarch64)
112116
target="$1"
113117
fbtarget=$target
114118
shift
@@ -404,7 +408,15 @@ win64)
404408
;;
405409
esac
406410

407-
bootfb_title=FreeBASIC-1.06.0-$fbtarget
411+
# choose a bootstrap source for the target
412+
case $fbtarget in
413+
linux-arm|linux-aarch64)
414+
bootfb_title=FreeBASIC-1.07.2-$fbtarget
415+
;;
416+
*)
417+
bootfb_title=FreeBASIC-1.06.0-$fbtarget
418+
;;
419+
esac
408420

409421
case $fbtarget in
410422
linux*)

makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,13 +1087,17 @@ bootstrap-dist:
10871087
mkdir -p bootstrap/linux-x86_64
10881088
mkdir -p bootstrap/win32
10891089
mkdir -p bootstrap/win64
1090+
mkdir -p bootstrap/linux-arm
1091+
mkdir -p bootstrap/linux-aarch64
10901092
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target dos && mv src/compiler/*.asm bootstrap/dos
10911093
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-x86 && mv src/compiler/*.asm bootstrap/freebsd-x86
10921094
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target freebsd-x86_64 && mv src/compiler/*.c bootstrap/freebsd-x86_64
10931095
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86 && mv src/compiler/*.asm bootstrap/linux-x86
10941096
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-x86_64 && mv src/compiler/*.c bootstrap/linux-x86_64
10951097
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win32 && mv src/compiler/*.asm bootstrap/win32
10961098
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target win64 && mv src/compiler/*.c bootstrap/win64
1099+
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-arm && mv src/compiler/*.c bootstrap/linux-arm
1100+
./$(FBC_EXE) src/compiler/*.bas -m fbc -i inc -e -r -v -target linux-aarch64 && mv src/compiler/*.c bootstrap/linux-aarch64
10971101

10981102
# Ensure to have LFs regardless of host system (LFs will probably work
10991103
# on DOS/Win32, but CRLFs could cause issues on Linux)
@@ -1104,6 +1108,8 @@ bootstrap-dist:
11041108
dos2unix bootstrap/linux-x86_64/*
11051109
dos2unix bootstrap/win32/*
11061110
dos2unix bootstrap/win64/*
1111+
dos2unix bootstrap/linux-arm/*
1112+
dos2unix bootstrap/linux-aarch64/*
11071113

11081114
# Package FB sources (similar to our "gitdist" command), and add the bootstrap/ directory
11091115
# Making a .tar.xz should be good enough for now.

0 commit comments

Comments
 (0)