|
 |
b854f98 |
From d12f535f6e41d821d7ddb3f24677ce2b071ba590 Mon Sep 17 00:00:00 2001
|
|
|
b34ba92 |
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
b34ba92 |
Date: Fri, 7 Jun 2019 20:55:25 -0400
|
|
|
f1635eb |
Subject: [PATCH 1/5] Use Fedora command names.
|
|
|
b34ba92 |
|
|
|
b34ba92 |
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
|
|
b34ba92 |
---
|
|
|
b854f98 |
compileopts/target.go | 8 ++++----
|
|
|
b854f98 |
main_test.go | 2 +-
|
|
|
b854f98 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
b34ba92 |
|
|
|
1dad7a6 |
diff --git a/compileopts/target.go b/compileopts/target.go
|
|
|
b854f98 |
index 8b3c68f..53b3b61 100644
|
|
|
1dad7a6 |
--- a/compileopts/target.go
|
|
|
1dad7a6 |
+++ b/compileopts/target.go
|
|
|
b854f98 |
@@ -174,7 +174,7 @@ func LoadTarget(target string) (*TargetSpec, error) {
|
|
|
b34ba92 |
}
|
|
|
b34ba92 |
target = llvmarch + "--" + llvmos
|
|
|
b34ba92 |
if goarch == "arm" {
|
|
|
b34ba92 |
- target += "-gnueabihf"
|
|
|
b34ba92 |
+ target += "-none"
|
|
|
b34ba92 |
}
|
|
|
b34ba92 |
return defaultTarget(goos, goarch, target)
|
|
|
b34ba92 |
}
|
|
|
b854f98 |
@@ -254,9 +254,9 @@ func defaultTarget(goos, goarch, triple string) (*TargetSpec, error) {
|
|
|
b34ba92 |
// Some educated guesses as to how to invoke helper programs.
|
|
|
b854f98 |
spec.GDB = "gdb-multiarch"
|
|
|
b34ba92 |
if goarch == "arm" && goos == "linux" {
|
|
|
5e83ee0 |
- spec.CFlags = append(spec.CFlags, "--sysroot=/usr/arm-linux-gnueabihf")
|
|
|
b34ba92 |
- spec.Linker = "arm-linux-gnueabihf-gcc"
|
|
|
b34ba92 |
- spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-gnueabihf"}
|
|
|
5e83ee0 |
+ spec.CFlags = append(spec.CFlags, "--sysroot=/usr/arm-linux-none")
|
|
|
b34ba92 |
+ spec.Linker = "arm-linux-gnu-gcc"
|
|
|
b34ba92 |
+ spec.Emulator = []string{"qemu-arm", "-L", "/usr/arm-linux-none"}
|
|
|
b34ba92 |
}
|
|
|
b34ba92 |
if goarch == "arm64" && goos == "linux" {
|
|
|
5e83ee0 |
spec.CFlags = append(spec.CFlags, "--sysroot=/usr/aarch64-linux-gnu")
|
|
|
1dad7a6 |
diff --git a/main_test.go b/main_test.go
|
|
|
b854f98 |
index a7eca14..f8285a2 100644
|
|
|
1dad7a6 |
--- a/main_test.go
|
|
|
1dad7a6 |
+++ b/main_test.go
|
|
|
b854f98 |
@@ -82,7 +82,7 @@ func TestCompiler(t *testing.T) {
|
|
|
b854f98 |
runPlatTests("i386--linux-gnu", matches, t)
|
|
|
b854f98 |
})
|
|
|
1dad7a6 |
t.Run("ARMLinux", func(t *testing.T) {
|
|
|
1dad7a6 |
- runPlatTests("arm--linux-gnueabihf", matches, t)
|
|
|
1dad7a6 |
+ runPlatTests("arm--linux-none", matches, t)
|
|
|
1dad7a6 |
})
|
|
|
1dad7a6 |
t.Run("ARM64Linux", func(t *testing.T) {
|
|
|
1dad7a6 |
runPlatTests("aarch64--linux-gnu", matches, t)
|
|
|
b34ba92 |
--
|
|
|
b854f98 |
2.29.2
|
|
|
b34ba92 |
|