Use a stub stdlib.h when compiling for UEFI targets #506
+16
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The freestanding part of |
int_util.c includes stdlib.h if `_WIN32` is defined. When compiling the UEFI targets with clang they are treated as Windows targets (e.g. if the Rust target is x86_64-unknown-uefi, the clang target is x86_64-unknown-windows-gnu). So stdlib.h gets included, even though we are compilling with `-ffreestanding` and don't want stdlib.h to be used. That file may not be present, or an incompatible version might be installed leading to typedef redefinition errors. The contents of stdlib.h aren't actually needed for these targets anyway (due to `__STDC_HOSTED__` being 0), so create a minimal stdlib.h in `build.rs` when `target_os == uefi` and add it to the include path.
nicholasbishop
force-pushed
the
bishop-fix-stdlib-inc
branch
from
69c69f4 to
c10cfb3
Compare
|
Updated the stub header to add the include as suggested. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
int_util.c includes stdlib.h if
_WIN32is defined. When compiling the UEFI targets with clang they are treated as Windows targets (e.g. if the Rust target isx86_64-unknown-uefi, the clang target isx86_64-unknown-windows-gnu). So stdlib.h gets included, even though we are compilling with-ffreestandingand don't want stdlib.h to be used. That file may not be present, or an incompatible version might be installed leading to typedef redefinition errors.The contents of stdlib.h aren't actually needed for these targets anyway (due to
__STDC_HOSTED__being 0), so create an empty stdlib.h inbuild.rswhentarget_os == uefiand add it to the include path.This is a partial fix for rust-lang/rust#104326.