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

build native/wasi with clang++ and keep embed building with clang

Browse Source
This commit is contained in:
Li Jie
2025-08-16 10:49:00 +08:00
parent 21174e44bb
commit b831952e2e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/crosscompile/crosscompile.go
View File

@@ -70,7 +70,7 @@ func getESPClangRoot() (clangRoot string, err error) {
// Try to download ESP Clang if platform is supported // Try to download ESP Clang if platform is supported
platformSuffix := getESPClangPlatform(runtime.GOOS, runtime.GOARCH) platformSuffix := getESPClangPlatform(runtime.GOOS, runtime.GOARCH)
if platformSuffix != "" { if platformSuffix != "" {
cacheClangDir := filepath.Join(env.LLGoCacheDir(), "crosscompile", "clang-"+espClangVersion) cacheClangDir := filepath.Join(env.LLGoCacheDir(), "crosscompile", "esp-clang-"+espClangVersion)
if _, err = os.Stat(cacheClangDir); err != nil { if _, err = os.Stat(cacheClangDir); err != nil {
if !errors.Is(err, fs.ErrNotExist) { if !errors.Is(err, fs.ErrNotExist) {
return return
@@ -119,6 +119,16 @@ func use(goos, goarch string, wasiThreads bool) (export Export, err error) {
targetTriple := llvm.GetTargetTriple(goos, goarch) targetTriple := llvm.GetTargetTriple(goos, goarch)
llgoRoot := env.LLGoROOT() llgoRoot := env.LLGoROOT()
// Check for ESP Clang support for target-based builds
clangRoot, err := getESPClangRoot()
if err != nil {
return
}
// Set ClangRoot and CC if clang is available
export.ClangRoot = clangRoot
export.CC = filepath.Join(clangRoot, "bin", "clang++")
if runtime.GOOS == goos && runtime.GOARCH == goarch { if runtime.GOOS == goos && runtime.GOARCH == goarch {
// not cross compile // not cross compile
// Set up basic flags for non-cross-compile // Set up basic flags for non-cross-compile
@@ -312,7 +322,7 @@ func useTarget(targetName string) (export Export, err error) {
// Set ClangRoot and CC if clang is available // Set ClangRoot and CC if clang is available
export.ClangRoot = clangRoot export.ClangRoot = clangRoot
export.CC = filepath.Join(clangRoot, "bin", "clang") export.CC = filepath.Join(clangRoot, "bin", "clang++")
// Convert target config to Export - only export necessary fields // Convert target config to Export - only export necessary fields
export.BuildTags = config.BuildTags export.BuildTags = config.BuildTags