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

feat(crosscompile): use versioned cache directory for ESP Clang

Browse Source 
Add version suffix to ESP Clang cache directory path to enable
automatic updates when espClangVersion changes.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Li Jie
2025-08-05 20:39:17 +08:00
parent 7c4c8b8726
commit 87f4f618aa
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
internal/crosscompile/crosscompile.go
View File

@@ -44,6 +44,38 @@ func cacheDir() string {
return filepath.Join(env.LLGoCacheDir(), "crosscompile") return filepath.Join(env.LLGoCacheDir(), "crosscompile")
} }
// getESPClangRoot returns the ESP Clang root directory, checking LLGoROOT first,
// then downloading if needed and platform is supported
func getESPClangRoot() (clangRoot string, err error) {
llgoRoot := env.LLGoROOT()
// First check if clang exists in LLGoROOT
espClangRoot := filepath.Join(llgoRoot, "crosscompile", "clang")
if _, err = os.Stat(espClangRoot); err == nil {
clangRoot = espClangRoot
return
}
// Try to download ESP Clang if platform is supported
platformSuffix := getESPClangPlatform(runtime.GOOS, runtime.GOARCH)
if platformSuffix != "" {
cacheClangDir := filepath.Join(env.LLGoCacheDir(), "crosscompile", "clang-"+espClangVersion)
if _, err = os.Stat(cacheClangDir); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return
}
if err = downloadAndExtractESPClang(platformSuffix, cacheClangDir); err != nil {
return
}
}
clangRoot = cacheClangDir
return
}
err = fmt.Errorf("ESP Clang not found in LLGoROOT and platform %s/%s is not supported for download", runtime.GOOS, runtime.GOARCH)
return
}
// getESPClangPlatform returns the platform suffix for ESP Clang downloads // getESPClangPlatform returns the platform suffix for ESP Clang downloads
func getESPClangPlatform(goos, goarch string) string { func getESPClangPlatform(goos, goarch string) string {
switch goos { switch goos {
@@ -258,36 +290,14 @@ func useTarget(targetName string) (export Export, err error) {
} }
// Check for ESP Clang support for target-based builds // Check for ESP Clang support for target-based builds
llgoRoot := env.LLGoROOT() clangRoot, err := getESPClangRoot()
var clangRoot string if err != nil {
return
// First check if clang exists in LLGoROOT
espClangRoot := filepath.Join(llgoRoot, "crosscompile", "clang")
if _, err = os.Stat(espClangRoot); err == nil {
clangRoot = espClangRoot
} else {
// Try to download ESP Clang if platform is supported
platformSuffix := getESPClangPlatform(runtime.GOOS, runtime.GOARCH)
if platformSuffix != "" {
cacheClangDir := filepath.Join(env.LLGoCacheDir(), "crosscompile", "clang")
if _, err = os.Stat(cacheClangDir); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return
}
if err = downloadAndExtractESPClang(platformSuffix, cacheClangDir); err != nil {
return
}
}
clangRoot = cacheClangDir
} else {
err = fmt.Errorf("ESP Clang not found in LLGoROOT and platform %s/%s is not supported for download", runtime.GOOS, runtime.GOARCH)
return
}
} }
// 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