Blob Blame Raw
From 9c481e7c6a10829f2c0c423a83df8ba44c53d7d6 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 7 Jun 2019 20:55:25 -0400
Subject: [PATCH 2/4] Use Fedora command names.

Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
 main_test.go | 2 +-
 target.go    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main_test.go b/main_test.go
index fa85a82..f0d403c 100644
--- a/main_test.go
+++ b/main_test.go
@@ -70,7 +70,7 @@ func TestCompiler(t *testing.T) {
 				continue // TODO: improve CGo
 			}
 			t.Run(path, func(t *testing.T) {
-				runTest(path, tmpdir, "arm--linux-gnueabihf", t)
+				runTest(path, tmpdir, "arm--linux-none", t)
 			})
 		}
 
diff --git a/target.go b/target.go
index fc4589b..6c29ce8 100644
--- a/target.go
+++ b/target.go
@@ -173,7 +173,7 @@ func LoadTarget(target string) (*TargetSpec, error) {
 		}
 		target = llvmarch + "--" + llvmos
 		if goarch == "arm" {
-			target += "-gnueabihf"
+			target += "-none"
 		}
 		return defaultTarget(goos, goarch, target)
 	}
@@ -238,9 +238,9 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
 	if goarch != runtime.GOARCH {
 		// Some educated guesses as to how to invoke helper programs.
 		if goarch == "arm" && goos == "linux" {
-			spec.Linker = "arm-linux-gnueabihf-gcc"
-			spec.GDB = "arm-linux-gnueabihf-gdb"
-			spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-gnueabihf"}
+			spec.Linker = "arm-linux-gnu-gcc"
+			spec.GDB = "arm-linux-gnu-gdb"
+			spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-none"}
 		}
 		if goarch == "arm64" && goos == "linux" {
 			spec.Linker = "aarch64-linux-gnu-gcc"
-- 
2.21.0