Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Download both the full and libs-only tarball in extended LLVM mode #432

Merged
merged 1 commit into from
Jun 28, 2024

Conversation

kyrias
Copy link
Contributor

@kyrias kyrias commented Jun 27, 2024

The Espressif-provided LLVM toolchain no longer has the libs-only tarball as a strict subset of the full tarball. Instead the "full" tarball now contains a clang with libclang built in. To work around this we now need to get both tarballs if we're in extended LLVM mode.

Cf. espressif/llvm-project#99

The Espressif-provided LLVM toolchain no longer has the libs-only
tarball as a strict subset of the full tarball.  Instead the "full"
tarball now contains a clang with libclang built in.  To work around
this we now need to get _both_ tarballs if we're in extended LLVM mode.

Cf. espressif/llvm-project#99

Signed-off-by: Johannes Löthberg <[email protected]>
@kyrias kyrias force-pushed the fix-extended-llvm branch from eb380a9 to 5c2e579 Compare June 27, 2024 13:32
Copy link
Member

@SergioGasquez SergioGasquez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for the contribution!

Tests

Before:

esp@b34942db9cf7:~/espup$ cargo r -r -- install -v 1.79.0.0 -e
...
[info]: Installation successfully completed!
...
esp@b34942db9cf7:~/espup$ ls /home/esp/.rustup/toolchains/esp/xtensa-esp32-elf-clang/esp-17.0.1_20240419/esp-clang/lib/
clang  clang-runtimes  libLTO.so  libLTO.so.17

With this PR:

esp@bc86fe468d17:~/espup$ cargo r -r -- install -v 1.79.0.0 -e
....
[info]: Installation successfully completed!
...
esp@bc86fe468d17:~/espup$ ls /home/esp/.rustup/toolchains/esp/xtensa-esp32-elf-clang/esp-17.0.1_20240419/esp-clang/lib/
clang  clang-runtimes  libLLVM-17.0.1.so  libLLVM-17.so  libLLVM.so  libLTO.so  libLTO.so.17  libclang-cpp.so  libclang-cpp.so.17  libclang.so  libclang.so.17  libclang.so.17.0.1

@SergioGasquez SergioGasquez merged commit 9c0234d into esp-rs:main Jun 28, 2024
17 checks passed
@kyrias kyrias deleted the fix-extended-llvm branch June 28, 2024 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants