Skip to content

Commit ceadb16

Browse files
committed
Revert "Linux: Disable LTO for ARM64/ARM32, it crashes on Raspberry Pi OS"
This reverts commit f8a41bc. This wasn't actually the cause for the crash. The issue is fixed by godotengine/build-containers#134.
1 parent ee35cb7 commit ceadb16

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

build-linux/build.sh

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ set -e
77
export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
88
export OPTIONS="production=yes"
99
export OPTIONS_MONO="module_mono_enabled=yes"
10-
export OPTIONS_ARM="lto=none"
1110
export TERM=xterm
1211

1312
rm -rf godot
@@ -48,26 +47,26 @@ if [ "${CLASSICAL}" == "1" ]; then
4847

4948
export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
5049

51-
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_ARM target=editor
50+
$SCONS platform=linuxbsd arch=arm64 $OPTIONS target=editor
5251
mkdir -p /root/out/arm64/tools
5352
cp -rvp bin/* /root/out/arm64/tools
5453
rm -rf bin
5554

56-
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_ARM target=template_debug
57-
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_ARM target=template_release
55+
$SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_debug
56+
$SCONS platform=linuxbsd arch=arm64 $OPTIONS target=template_release
5857
mkdir -p /root/out/arm64/templates
5958
cp -rvp bin/* /root/out/arm64/templates
6059
rm -rf bin
6160

6261
export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
6362

64-
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_ARM target=editor
63+
$SCONS platform=linuxbsd arch=arm32 $OPTIONS target=editor
6564
mkdir -p /root/out/arm32/tools
6665
cp -rvp bin/* /root/out/arm32/tools
6766
rm -rf bin
6867

69-
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_ARM target=template_debug
70-
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_ARM target=template_release
68+
$SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_debug
69+
$SCONS platform=linuxbsd arch=arm32 $OPTIONS target=template_release
7170
mkdir -p /root/out/arm32/templates
7271
cp -rvp bin/* /root/out/arm32/templates
7372
rm -rf bin
@@ -111,28 +110,28 @@ if [ "${MONO}" == "1" ]; then
111110

112111
export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
113112

114-
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO $OPTIONS_ARM target=editor
113+
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=editor
115114
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
116115
mkdir -p /root/out/arm64/tools-mono
117116
cp -rvp bin/* /root/out/arm64/tools-mono
118117
rm -rf bin
119118

120-
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO $OPTIONS_ARM target=template_debug
121-
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO $OPTIONS_ARM target=template_release
119+
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_debug
120+
$SCONS platform=linuxbsd arch=arm64 $OPTIONS $OPTIONS_MONO target=template_release
122121
mkdir -p /root/out/arm64/templates-mono
123122
cp -rvp bin/* /root/out/arm64/templates-mono
124123
rm -rf bin
125124

126125
export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
127126

128-
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO $OPTIONS_ARM target=editor
127+
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=editor
129128
./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
130129
mkdir -p /root/out/arm32/tools-mono
131130
cp -rvp bin/* /root/out/arm32/tools-mono
132131
rm -rf bin
133132

134-
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO $OPTIONS_ARM target=template_debug
135-
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO $OPTIONS_ARM target=template_release
133+
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_debug
134+
$SCONS platform=linuxbsd arch=arm32 $OPTIONS $OPTIONS_MONO target=template_release
136135
mkdir -p /root/out/arm32/templates-mono
137136
cp -rvp bin/* /root/out/arm32/templates-mono
138137
rm -rf bin

0 commit comments

Comments
 (0)