From 16c88f6deb5aecc39d74f777905ca2a4abba8b2e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 6 Nov 2026 19:07:26 +0900 Subject: cmd/dist: override CC/CXX for cross only The Rosa OS target triple does not work outside of Rosa OS. Signed-off-by: Ophestra --- cmd/dist/main.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'cmd/dist/main.go') diff --git a/cmd/dist/main.go b/cmd/dist/main.go index b3b58b56..f3717214 100644 --- a/cmd/dist/main.go +++ b/cmd/dist/main.go @@ -85,6 +85,7 @@ func main() { llvmArch := mustLLVMArch(arch) target := llvmArch + "-rosa-linux-musl" + cross := arch != runtime.GOARCH if verbose { log.Println() @@ -94,12 +95,14 @@ func main() { version += "-race" } - for _, env := range [][2]string{ - {"CC", "clang --target=" + target + " --sysroot=" + sysroot}, - {"CXX", "clang++ --target=" + target + " --sysroot=" + sysroot}, - } { - if err := os.Setenv(env[0], env[1]); err != nil { - log.Fatal(err) + if cross { + for _, env := range [][2]string{ + {"CC", "clang --target=" + target + " --sysroot=" + sysroot}, + {"CXX", "clang++ --target=" + target + " --sysroot=" + sysroot}, + } { + if err := os.Setenv(env[0], env[1]); err != nil { + log.Fatal(err) + } } } @@ -192,7 +195,7 @@ func main() { ) log.Println() - if arch == runtime.GOARCH && runTests { + if !cross && runTests { log.Println("##### Testing Hakurei.") mustRun( ctx, nil, "go", "test", raceFlag, -- cgit v1.3.1