From 3b67fec678ae30212c6b779447518974034bb67f Mon Sep 17 00:00:00 2001 From: aloaf Date: Sat, 7 Feb 2026 20:59:31 -0600 Subject: [PATCH 1/3] Add GCC 4.4.3 to Android NDK r8e --- backend/compilers/compilers.linux.yaml | 1 + backend/coreapp/compilers.py | 11 +++++++++-- frontend/src/lib/i18n/locales/en/compilers.json | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/backend/compilers/compilers.linux.yaml b/backend/compilers/compilers.linux.yaml index d5a527cf2..9fa4c286c 100644 --- a/backend/compilers/compilers.linux.yaml +++ b/backend/compilers/compilers.linux.yaml @@ -232,3 +232,4 @@ win32: android_x86: - ndk-r8e-gcc-4.7 + - ndk-r8e-gcc-4.4.3 diff --git a/backend/coreapp/compilers.py b/backend/coreapp/compilers.py index 7054aa19f..f149265d6 100644 --- a/backend/coreapp/compilers.py +++ b/backend/coreapp/compilers.py @@ -1565,12 +1565,18 @@ def available_platforms() -> List[Platform]: cc=BORLAND_MSDOS_CC, ) -ANDROID_R8E_C = GCCCompiler( +ANDROID_R8E_47_C = GCCCompiler( id="ndk-r8e-gcc-4.7", platform=ANDROID_X86, cc='"$COMPILER_DIR"/toolchains/x86-4.7/prebuilt/linux-x86_64/bin/i686-linux-android-gcc -c --sysroot="$COMPILER_DIR"/platforms/android-9/arch-x86 $COMPILER_FLAGS -o "$OUTPUT" "$INPUT"', ) +ANDROID_R8E_443_C = GCCCompiler( + id="ndk-r8e-gcc-4.4.3", + platform=ANDROID_X86, + cc='"$COMPILER_DIR"/toolchains/x86-4.4.3/prebuilt/linux-x86_64/bin/i686-linux-android-gcc -c --sysroot="$COMPILER_DIR"/platforms/android-9/arch-x86 $COMPILER_FLAGS -o "$OUTPUT" "$INPUT"', +) + _all_compilers: List[Compiler] = [ DUMMY, DUMMY_LONGRUNNING, @@ -1812,7 +1818,8 @@ def available_platforms() -> List[Platform]: BORLAND_20_C, BORLAND_31_C, # GCC, Android - ANDROID_R8E_C, + ANDROID_R8E_47_C, + ANDROID_R8E_443_C, ] _compilers = OrderedDict({c.id: c for c in _all_compilers if c.available()}) diff --git a/frontend/src/lib/i18n/locales/en/compilers.json b/frontend/src/lib/i18n/locales/en/compilers.json index 9c509e19d..e6c72a2dc 100644 --- a/frontend/src/lib/i18n/locales/en/compilers.json +++ b/frontend/src/lib/i18n/locales/en/compilers.json @@ -252,6 +252,7 @@ "cygnus-2.7-96Q3": "cygnus-2.7-96Q3 SOA-960904", "ndk-r8e-gcc-4.7": "Android NDK r8e (GCC 4.7)", + "ndk-r8e-gcc-4.4.3": "Android NDK r8e (GCC 4.4.3)", "armcc_opt_level": "Optimization level", "armcc_opt_level.-O0": "No optimization", From 4226c1568e8348418c300063ade126ee2af1da84 Mon Sep 17 00:00:00 2001 From: aloaf Date: Sun, 8 Feb 2026 12:24:54 -0600 Subject: [PATCH 2/3] Fix ordering of Android compilers --- backend/compilers/compilers.linux.yaml | 2 +- backend/coreapp/compilers.py | 12 ++++++------ frontend/src/lib/i18n/locales/en/compilers.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/compilers/compilers.linux.yaml b/backend/compilers/compilers.linux.yaml index 9fa4c286c..8e3f901f1 100644 --- a/backend/compilers/compilers.linux.yaml +++ b/backend/compilers/compilers.linux.yaml @@ -231,5 +231,5 @@ win32: - msvc8.0p android_x86: - - ndk-r8e-gcc-4.7 - ndk-r8e-gcc-4.4.3 + - ndk-r8e-gcc-4.7 diff --git a/backend/coreapp/compilers.py b/backend/coreapp/compilers.py index f149265d6..01dfe2458 100644 --- a/backend/coreapp/compilers.py +++ b/backend/coreapp/compilers.py @@ -1565,18 +1565,18 @@ def available_platforms() -> List[Platform]: cc=BORLAND_MSDOS_CC, ) -ANDROID_R8E_47_C = GCCCompiler( - id="ndk-r8e-gcc-4.7", - platform=ANDROID_X86, - cc='"$COMPILER_DIR"/toolchains/x86-4.7/prebuilt/linux-x86_64/bin/i686-linux-android-gcc -c --sysroot="$COMPILER_DIR"/platforms/android-9/arch-x86 $COMPILER_FLAGS -o "$OUTPUT" "$INPUT"', -) - ANDROID_R8E_443_C = GCCCompiler( id="ndk-r8e-gcc-4.4.3", platform=ANDROID_X86, cc='"$COMPILER_DIR"/toolchains/x86-4.4.3/prebuilt/linux-x86_64/bin/i686-linux-android-gcc -c --sysroot="$COMPILER_DIR"/platforms/android-9/arch-x86 $COMPILER_FLAGS -o "$OUTPUT" "$INPUT"', ) +ANDROID_R8E_47_C = GCCCompiler( + id="ndk-r8e-gcc-4.7", + platform=ANDROID_X86, + cc='"$COMPILER_DIR"/toolchains/x86-4.7/prebuilt/linux-x86_64/bin/i686-linux-android-gcc -c --sysroot="$COMPILER_DIR"/platforms/android-9/arch-x86 $COMPILER_FLAGS -o "$OUTPUT" "$INPUT"', +) + _all_compilers: List[Compiler] = [ DUMMY, DUMMY_LONGRUNNING, diff --git a/frontend/src/lib/i18n/locales/en/compilers.json b/frontend/src/lib/i18n/locales/en/compilers.json index e6c72a2dc..6432a3ca8 100644 --- a/frontend/src/lib/i18n/locales/en/compilers.json +++ b/frontend/src/lib/i18n/locales/en/compilers.json @@ -251,8 +251,8 @@ "cygnus-2.7-96Q3": "cygnus-2.7-96Q3 SOA-960904", - "ndk-r8e-gcc-4.7": "Android NDK r8e (GCC 4.7)", "ndk-r8e-gcc-4.4.3": "Android NDK r8e (GCC 4.4.3)", + "ndk-r8e-gcc-4.7": "Android NDK r8e (GCC 4.7)", "armcc_opt_level": "Optimization level", "armcc_opt_level.-O0": "No optimization", From 06cfcfff02a9a5fdcc1b73b2728f75f6a2203468 Mon Sep 17 00:00:00 2001 From: aloaf Date: Sun, 8 Feb 2026 12:32:32 -0600 Subject: [PATCH 3/3] Android Order fix pt. 2 --- backend/coreapp/compilers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/coreapp/compilers.py b/backend/coreapp/compilers.py index 01dfe2458..52c5b9350 100644 --- a/backend/coreapp/compilers.py +++ b/backend/coreapp/compilers.py @@ -1818,8 +1818,8 @@ def available_platforms() -> List[Platform]: BORLAND_20_C, BORLAND_31_C, # GCC, Android - ANDROID_R8E_47_C, ANDROID_R8E_443_C, + ANDROID_R8E_47_C, ] _compilers = OrderedDict({c.id: c for c in _all_compilers if c.available()})