admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env:find crosscompile llvm

Browse Source
This commit is contained in:
luoliwoshang
2025-09-09 10:16:39 +08:00
parent 848432ea68
commit 68623f0b27
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.goreleaser.yaml
View File

@@ -27,7 +27,6 @@ builds:
ldflags: ldflags:
- -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}} - -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}}
- -X github.com/goplus/llgo/internal/env.buildTime={{.Date}} - -X github.com/goplus/llgo/internal/env.buildTime={{.Date}}
- -X github.com/goplus/llgo/xtool/env/llvm.ldLLVMConfigBin=../crosscompile/clang/bin/llvm-config
env: env:
- CC=o64-clang - CC=o64-clang
- CXX=o64-clang++ - CXX=o64-clang++
@@ -48,7 +47,6 @@ builds:
ldflags: ldflags:
- -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}} - -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}}
- -X github.com/goplus/llgo/internal/env.buildTime={{.Date}} - -X github.com/goplus/llgo/internal/env.buildTime={{.Date}}
- -X github.com/goplus/llgo/xtool/env/llvm.ldLLVMConfigBin=../crosscompile/clang/bin/llvm-config
env: env:
- CC=oa64-clang - CC=oa64-clang
- CXX=oa64-clang++ - CXX=oa64-clang++
@@ -69,7 +67,6 @@ builds:
ldflags: ldflags:
- -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}} - -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}}
- -X github.com/goplus/llgo/internal/env.buildTime={{.Date}} - -X github.com/goplus/llgo/internal/env.buildTime={{.Date}}
- -X github.com/goplus/llgo/xtool/env/llvm.ldLLVMConfigBin=../crosscompile/clang/bin/llvm-config
env: env:
- CC=x86_64-linux-gnu-gcc - CC=x86_64-linux-gnu-gcc
- CXX=x86_64-linux-gnu-g++ - CXX=x86_64-linux-gnu-g++
@@ -90,7 +87,6 @@ builds:
ldflags: ldflags:
- -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}} - -X github.com/goplus/llgo/internal/env.buildVersion=v{{.Version}}
- -X github.com/goplus/llgo/internal/env.buildTime={{.Date}} - -X github.com/goplus/llgo/internal/env.buildTime={{.Date}}
- -X github.com/goplus/llgo/xtool/env/llvm.ldLLVMConfigBin=../crosscompile/clang/bin/llvm-config
env: env:
- CC=aarch64-linux-gnu-gcc - CC=aarch64-linux-gnu-gcc
- CXX=aarch64-linux-gnu-g++ - CXX=aarch64-linux-gnu-g++

3
internal/crosscompile/crosscompile.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/goplus/llgo/internal/flash" "github.com/goplus/llgo/internal/flash"
"github.com/goplus/llgo/internal/targets" "github.com/goplus/llgo/internal/targets"
"github.com/goplus/llgo/internal/xtool/llvm" "github.com/goplus/llgo/internal/xtool/llvm"
envllvm "github.com/goplus/llgo/xtool/env/llvm"
) )
type Export struct { type Export struct {
@@ -108,7 +109,7 @@ func getESPClangRoot(forceEspClang bool) (clangRoot string, err error) {
llgoRoot := env.LLGoROOT() llgoRoot := env.LLGoROOT()
// First check if clang exists in LLGoROOT // First check if clang exists in LLGoROOT
espClangRoot := filepath.Join(llgoRoot, "crosscompile", "clang") espClangRoot := filepath.Join(llgoRoot, envllvm.CrosscompileClangPath)
if _, err = os.Stat(espClangRoot); err == nil { if _, err = os.Stat(espClangRoot); err == nil {
clangRoot = espClangRoot clangRoot = espClangRoot
return return

18
xtool/env/llvm/llvm.go vendored
View File

@@ -22,6 +22,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/goplus/llgo/internal/env"
"github.com/goplus/llgo/xtool/clang" "github.com/goplus/llgo/xtool/clang"
"github.com/goplus/llgo/xtool/llvm/install_name_tool" "github.com/goplus/llgo/xtool/llvm/install_name_tool"
"github.com/goplus/llgo/xtool/llvm/llvmlink" "github.com/goplus/llgo/xtool/llvm/llvmlink"
@@ -30,9 +31,13 @@ import (
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// defaultLLVMConfigBin returns the default path to the llvm-config binary. It const (
// checks the LLVM_CONFIG environment variable first, then searches in PATH. If // CrosscompileClangPath is the relative path from LLGO_ROOT to the clang installation
// not found, it returns [ldLLVMConfigBin] as a last resort. CrosscompileClangPath = "crosscompile/clang"
)
// -----------------------------------------------------------------------------
func defaultLLVMConfigBin() string { func defaultLLVMConfigBin() string {
bin := os.Getenv("LLVM_CONFIG") bin := os.Getenv("LLVM_CONFIG")
if bin != "" { if bin != "" {
@@ -42,6 +47,13 @@ func defaultLLVMConfigBin() string {
if bin != "" { if bin != "" {
return bin return bin
} }
llgoRoot := env.LLGoROOT()
// Check LLGO_ROOT/crosscompile/clang for llvm-config
crossLLVMConfigBin := filepath.Join(llgoRoot, CrosscompileClangPath, "bin", "llvm-config")
if _, err := os.Stat(crossLLVMConfigBin); err == nil {
return crossLLVMConfigBin
}
return ldLLVMConfigBin return ldLLVMConfigBin
} }