From 373558b2ec106d2338373327b0817d32a132228f Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Sun, 27 Nov 2022 21:53:18 +0100
Subject: [PATCH] Fix c compiler (CC env) (ref #1864)

Fixes 294207259437d0e5e8310b0c71230bba00cacefb
---
 syncthing/build-syncthing.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py
index 4a220ca5..ed7e27a7 100644
--- a/syncthing/build-syncthing.py
+++ b/syncthing/build-syncthing.py
@@ -18,25 +18,25 @@ BUILD_TARGETS = [
         'arch': 'arm',
         'goarch': 'arm',
         'jni_dir': 'armeabi',
-        'cc': 'armv7a-linux-androideabi16-clang',
+        'cc': 'armv7a-linux-androideabi{}-clang',
     },
     {
         'arch': 'arm64',
         'goarch': 'arm64',
         'jni_dir': 'arm64-v8a',
-        'cc': 'aarch64-linux-android21-clang',
+        'cc': 'aarch64-linux-android{}-clang',
     },
     {
         'arch': 'x86',
         'goarch': '386',
         'jni_dir': 'x86',
-        'cc': 'i686-linux-android16-clang',
+        'cc': 'i686-linux-android{}-clang',
     },
     {
         'arch': 'x86_64',
         'goarch': 'amd64',
         'jni_dir': 'x86_64',
-        'cc': 'x86_64-linux-android21-clang',
+        'cc': 'x86_64-linux-android{}-clang',
     }
 ]
 
@@ -97,7 +97,7 @@ for target in BUILD_TARGETS:
 
     cc = '/'.join([
         get_ndk_home(), "toolchains/llvm/prebuilt/", PLATFORM_DIRS[platform.system()], "bin",
-        target['cc']])
+        target['cc'].format(min_sdk)])
     subprocess.check_call(
         ['go', 'run', 'build.go', '-goos', 'android',
          '-goarch', target['goarch'], '-cc', cc,