From fea317f4e1ac8a39cd725d852b60936f25f2b23d Mon Sep 17 00:00:00 2001
From: Changkun Ou <hi@changkun.de>
Date: Fri, 3 Dec 2021 22:42:54 +0100
Subject: [PATCH] cmd/gomobile: use LLVM binutils if GNU binutils are missing

Starting from NDK 23, GNU binutils are fully migrated to LLVM binutils.
Use LLVM if GNU binutils are missing.

Fixes golang/go#49808

Change-Id: Iccb40780390a66081fc811d717c7357194b92acf
Reviewed-on: https://go-review.googlesource.com/c/mobile/+/369195
Run-TryBot: Hajime Hoshi <hajimehoshi@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Hajime Hoshi <hajimehoshi@gmail.com>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
---
 cmd/gomobile/env.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/cmd/gomobile/env.go b/cmd/gomobile/env.go
index 69bb710..a7f5485 100644
--- a/cmd/gomobile/env.go
+++ b/cmd/gomobile/env.go
@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"io/fs"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -427,14 +428,23 @@ func (tc *ndkToolchain) ClangPrefix() string {
 }
 
 func (tc *ndkToolchain) Path(ndkRoot, toolName string) string {
-	var pref string
+	cmdFromPref := func(pref string) string {
+		return filepath.Join(ndkRoot, "toolchains", "llvm", "prebuilt", archNDK(), "bin", pref+"-"+toolName)
+	}
+
+	var cmd string
 	switch toolName {
 	case "clang", "clang++":
-		pref = tc.ClangPrefix()
+		cmd = cmdFromPref(tc.ClangPrefix())
 	default:
-		pref = tc.toolPrefix
+		cmd = cmdFromPref(tc.toolPrefix)
+		// Starting from NDK 23, GNU binutils are fully migrated to LLVM binutils.
+		// See https://android.googlesource.com/platform/ndk/+/master/docs/Roadmap.md#ndk-r23
+		if _, err := os.Stat(cmd); errors.Is(err, fs.ErrNotExist) {
+			cmd = cmdFromPref("llvm")
+		}
 	}
-	return filepath.Join(ndkRoot, "toolchains", "llvm", "prebuilt", archNDK(), "bin", pref+"-"+toolName)
+	return cmd
 }
 
 type ndkConfig map[string]ndkToolchain // map: GOOS->androidConfig.