mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 21:06:09 +00:00
build: the i386 preloads after every aarch64 one
gcc-multilib conflicts with the aarch64 cross compiler and removed it, so the next aarch64 build in the step failed (exit 127).
This commit is contained in:
1 parent
49f1ceaadc
commit
cca4ff3746
1 file changed
+5
-4
@@ -187,7 +187,11 @@ jobs:
|
||||
-pthread -std=c++17 -static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL \
|
||||
-o "$D/libfakeinput-x86_64.so" app/src/main/cpp/fakeinput_steam.cpp -ldl
|
||||
strip --strip-unneeded "$D/libfakeinput-x86_64.so"
|
||||
# And for 32-bit x86 programs (Left 4 Dead 2 and the other Source games are i386).
|
||||
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
|
||||
@@ -195,9 +199,6 @@ jobs:
|
||||
-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"
|
||||
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"
|
||||
for script in tools/linuxfs/overlay/usr/local/bin/bannerlator-*; do
|
||||
install -Dm644 "$script" "$D/usr/local/bin/$(basename "$script")"
|
||||
done
|
||||
|
||||
Reference in new issue
Block a user