better detection for the llvm toolchain in the NDK

2026-04-23 20:31:17 +08:00 · 2014-10-22 14:28:36 +02:00
parent 6216257c49
commit bf46410d5c
1 changed files with 8 additions and 1 deletions
--- a/lib/motion/project/template/android/config.rb
+++ b/lib/motion/project/template/android/config.rb
@@ -142,7 +142,14 @@ module Motion; module Project;
    end

    def ndk_toolchain_bin_dir
-      File.join(ndk_path, 'toolchains/llvm-3.3/prebuilt/darwin-x86_64/bin')
+      @ndk_toolchain_bin_dir ||= begin
+        paths = ['3.3', '3.4', '3.5'].map do |x|
+          File.join(ndk_path, "toolchains/llvm-#{x}/prebuilt/darwin-x86_64/bin")
+        end
+        path = paths.find { |x| File.exist?(x) }
+        App.fail "Can't locate a proper NDK toolchain (paths tried: #{paths.join(' ')})" unless path
+        path
+      end
    end

    def cc