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

fix wasi-libc caching path

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

8
internal/crosscompile/crosscompile.go
View File

@@ -180,15 +180,9 @@ func use(goos, goarch string, wasiThreads bool) (export Export, err error) {
// If not exists in LLGoROOT, download and use cached wasiSdkRoot // If not exists in LLGoROOT, download and use cached wasiSdkRoot
if _, err = os.Stat(wasiSdkRoot); err != nil { if _, err = os.Stat(wasiSdkRoot); err != nil {
sdkDir := filepath.Join(cacheDir(), llvm.GetTargetTriple(goos, goarch)) sdkDir := filepath.Join(cacheDir(), llvm.GetTargetTriple(goos, goarch))
if _, err = os.Stat(sdkDir); err != nil { if wasiSdkRoot, err = checkDownloadAndExtract(wasiSdkUrl, sdkDir); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return return
} }
if wasiSdkRoot, err = downloadAndExtract(wasiSdkUrl, sdkDir); err != nil {
return
}
}
} }
// WASI-SDK configuration // WASI-SDK configuration
triple := "wasm32-wasip1" triple := "wasm32-wasip1"

6
internal/crosscompile/fetch.go
View File

@@ -12,10 +12,9 @@ import (
"strings" "strings"
) )
func downloadAndExtract(url, dir string) (wasiSdkRoot string, err error) { func checkDownloadAndExtract(url, dir string) (wasiSdkRoot string, err error) {
if _, err = os.Stat(dir); err == nil { if _, err = os.Stat(dir); err != nil {
os.RemoveAll(dir) os.RemoveAll(dir)
}
tempDir := dir + ".temp" tempDir := dir + ".temp"
os.RemoveAll(tempDir) os.RemoveAll(tempDir)
if err := os.MkdirAll(tempDir, 0755); err != nil { if err := os.MkdirAll(tempDir, 0755); err != nil {
@@ -43,6 +42,7 @@ func downloadAndExtract(url, dir string) (wasiSdkRoot string, err error) {
if err = os.Rename(tempDir, dir); err != nil { if err = os.Rename(tempDir, dir); err != nil {
return "", fmt.Errorf("failed to rename directory: %w", err) return "", fmt.Errorf("failed to rename directory: %w", err)
} }
}
wasiSdkRoot = filepath.Join(dir, "wasi-sdk-25.0-x86_64-macos") wasiSdkRoot = filepath.Join(dir, "wasi-sdk-25.0-x86_64-macos")
return return
} }