diff --git a/internal/crosscompile/crosscompile.go b/internal/crosscompile/crosscompile.go index 733132a6..df20f644 100644 --- a/internal/crosscompile/crosscompile.go +++ b/internal/crosscompile/crosscompile.go @@ -36,8 +36,8 @@ type Export struct { const wasiSdkUrl = "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-macos.tar.gz" const ( - espClangBaseUrl = "https://github.com/espressif/llvm-project/releases/download/esp-19.1.2_20250312" - espClangVersion = "esp-19.1.2_20250312" + espClangBaseUrl = "https://github.com/goplus/espressif-llvm-project-prebuilt/releases/download/19.1.2_20250805" + espClangVersion = "19.1.2_20250805" ) func cacheDir() string { diff --git a/internal/crosscompile/fetch.go b/internal/crosscompile/fetch.go index 598b8f02..72dd166d 100644 --- a/internal/crosscompile/fetch.go +++ b/internal/crosscompile/fetch.go @@ -133,17 +133,10 @@ func downloadAndExtractESPClang(platformSuffix, dir string) error { defer os.RemoveAll(downloadDir) // Download clang binary package - clangUrl := fmt.Sprintf("%s/clang-%s-%s.tar.xz", espClangBaseUrl, espClangVersion, platformSuffix) + clangUrl := fmt.Sprintf("%s/clang-esp-%s-%s.tar.xz", espClangBaseUrl, espClangVersion, platformSuffix) clangFile := filepath.Join(downloadDir, fmt.Sprintf("clang-%s-%s.tar.xz", espClangVersion, platformSuffix)) if err := downloadFile(clangUrl, clangFile); err != nil { - return fmt.Errorf("failed to download clang: %w", err) - } - - // Download libs package - libsUrl := fmt.Sprintf("%s/libs-clang-%s-%s.tar.xz", espClangBaseUrl, espClangVersion, platformSuffix) - libsFile := filepath.Join(downloadDir, fmt.Sprintf("libs-clang-%s-%s.tar.xz", espClangVersion, platformSuffix)) - if err := downloadFile(libsUrl, libsFile); err != nil { - return fmt.Errorf("failed to download libs: %w", err) + return fmt.Errorf("failed to download clang from %s: %w", clangUrl, err) } // Create extract temp directory @@ -158,9 +151,6 @@ func downloadAndExtractESPClang(platformSuffix, dir string) error { if err := extractTarXz(clangFile, extractDir); err != nil { return fmt.Errorf("failed to extract clang: %w", err) } - if err := extractTarXz(libsFile, extractDir); err != nil { - return fmt.Errorf("failed to extract libs: %w", err) - } // Rename esp-clang directory to final destination espClangDir := filepath.Join(extractDir, "esp-clang")