Skip to content

Use clang for the UEFI targets #104622

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 22, 2022
Merged

Use clang for the UEFI targets #104622

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdb6907
Update compiler_builtins to 0.1.84
nicholasbishop Nov 18, 2022
eafe61d
dist-various-2: Use clang for the UEFI targets
nicholasbishop Nov 20, 2022
01a2a54
test-various: Use clang for the UEFI test
nicholasbishop Nov 20, 2022
6054608
dist: Ensure UEFI rlibs are all COFF
nicholasbishop Nov 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
dist-various-2: Use clang for the UEFI targets 
This fixes an issue where the C and asm sources built by
compiler_builtins were being compiled as ELF objects instead of PE
objects. This wasn't noticed before because it doesn't cause
compiler_builtins or rustc to fail to build. You only see a failure when
a program is built that references one of the symbols in an ELF object.

Compiling with clang fixes this because the `cc` crate converts the UEFI
targets into Windows targets that clang understands, causing it to
produce PE objects.

Note that this requires compiler_builtins >= 0.1.84.

Fixes #104326
  • Loading branch information
@nicholasbishop
nicholasbishop committed Nov 20, 2022
commit eafe61d6bd9d983535a90b29ef5497b0a6e42019
6 changes: 6 additions & 0 deletions src/ci/docker/host-x86_64/dist-various-2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ ENV \
AR_i686_unknown_freebsd=i686-unknown-freebsd12-ar \
CC_i686_unknown_freebsd=i686-unknown-freebsd12-clang \
CXX_i686_unknown_freebsd=i686-unknown-freebsd12-clang++ \
CC_aarch64_unknown_uefi=clang-11 \
CXX_aarch64_unknown_uefi=clang++-11 \
CC_i686_unknown_uefi=clang-11 \
CXX_i686_unknown_uefi=clang++-11 \
CC_x86_64_unknown_uefi=clang-11 \
CXX_x86_64_unknown_uefi=clang++-11 \
CC=gcc-8 \
CXX=g++-8

Expand Down