build: the i386 preloads at the very end of the preload step

The step also builds libtracefs with the aarch64 cross compiler after the
first move; gcc-multilib must come after all of them.
This commit is contained in:
The412Banner committed 2026-10-02 18:20:48 -04:00
1 parent cca4ff3746
commit 822ca6405f
1 file changed
+9 -10
+9 -10
View File
@@ -190,15 +190,6 @@ jobs:
aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \
-o "$D/libblfastpath.so" tools/proot/fastpath/fastpath.c -ldl
aarch64-linux-gnu-strip --strip-unneeded "$D/libblfastpath.so"
# And for 32-bit x86 programs (Left 4 Dead 2 and the other Source games are i386). Last:
# gcc-multilib conflicts with the aarch64 cross compiler and removes it.
sudo apt-get install -y -qq gcc-multilib g++-multilib >/dev/null
gcc -m32 -shared -fPIC -O2 -Wall -pthread \
-o "$D/libblsession-i386.so" tools/linuxfs/preload/*.c -ldl
g++ -m32 -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \
-pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \
-o "$D/libfakeinput-i386.so" app/src/main/cpp/fakeinput_steam.cpp -ldl
strip --strip-unneeded "$D/libblsession-i386.so" "$D/libfakeinput-i386.so"
for script in tools/linuxfs/overlay/usr/local/bin/bannerlator-*; do
install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")"
done
@@ -249,7 +240,15 @@ jobs:
install -Dm644 tools/linuxfs/desktop/panel.conf "$D/etc/xdg/lxqt/panel.conf"
install -Dm644 tools/linuxfs/desktop/firefox-droiddeck.js "$D/usr/lib/firefox/defaults/pref/droiddeck.js"
ls -lR "$D"
# And for 32-bit x86 programs (Left 4 Dead 2 and the other Source games are i386). Last:
# gcc-multilib conflicts with the aarch64 cross compiler and removes it.
sudo apt-get install -y -qq gcc-multilib g++-multilib >/dev/null
gcc -m32 -shared -fPIC -O2 -Wall -pthread \
-o "$D/libblsession-i386.so" tools/linuxfs/preload/*.c -ldl
g++ -m32 -shared -fPIC -O2 -Wall -Wno-attributes -Wno-nonnull-compare \
-pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \
-o "$D/libfakeinput-i386.so" app/src/main/cpp/fakeinput_steam.cpp -ldl
strip --strip-unneeded "$D/libblsession-i386.so" "$D/libfakeinput-i386.so"
- name: Cache PulseAudio 13.0 source
id: pa-src
uses: actions/cache@v4