[libc] Use -nostdlibinc in the full build mode #97461
Merged
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
This avoids accidentally including system headers.
|
@llvm/pr-subscribers-libc Author: Petr Hosek (petrhosek) ChangesThis avoids accidentally including system headers. Full diff: https://github.com/llvm/llvm-project/pull/97461.diff 2 Files Affected:
diff --git a/libc/cmake/modules/CheckCompilerFeatures.cmake b/libc/cmake/modules/CheckCompilerFeatures.cmake
index 17806588550eb..52090d2ab4097 100644
--- a/libc/cmake/modules/CheckCompilerFeatures.cmake
+++ b/libc/cmake/modules/CheckCompilerFeatures.cmake
@@ -73,3 +73,6 @@ check_cxx_compiler_flag("-ftrivial-auto-var-init=pattern" LIBC_CC_SUPPORTS_PATTE
# clang-6+, gcc-13+
check_cxx_compiler_flag("-nostdlib++" LIBC_CC_SUPPORTS_NOSTDLIBPP)
+
+# clang-3.0+
+check_c_compiler_flag("-nostdlibinc" LIBC_C_SUPPORTS_NOSTDLIBINC)
diff --git a/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake b/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake
index 3bf429381d4af..441a816176e68 100644
--- a/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake
+++ b/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake
@@ -46,6 +46,10 @@ function(_get_common_compile_options output_var flags)
list(APPEND compile_options "-DLIBC_FULL_BUILD")
# Only add -ffreestanding flag in full build mode.
list(APPEND compile_options "-ffreestanding")
+ # Manually disable all standard include paths.
+ if(LIBC_C_SUPPORTS_NOSTDLIBINC)
+ list(APPEND compile_options "-nostdlibinc")
+ endif()
endif()
if(LIBC_COMPILER_HAS_FIXED_POINT)
|
jhuber6
reviewed
Jul 2, 2024
I was about to reach out to and ask if you want to use this flag for the GPU build as well? AFAIK this flag is exactly what you've done in llvm-project/libc/cmake/modules/LLVMLibCCompileOptionRules.cmake Lines 114 to 115 in 5f1743c |
jhuber6
reviewed
Jul 2, 2024
Comment on lines
120
to
127
| # Manually disable standard include paths to prevent system headers from | ||
| # being included. | ||
| if(LIBC_C_SUPPORTS_NOSTDLIBINC) | ||
| list(APPEND compile_options "-nostdlibinc") | ||
| else() | ||
| list(APPEND compile_options "-isystem${COMPILER_RESOURCE_DIR}/include") | ||
| list(APPEND compile_options "-nostdinc") | ||
| endif() |
There was a problem hiding this comment.
I don't think we need to duplicate the logic here, since the GPU libc build should already in full build mode it should hit the condition above.
jhuber6
reviewed
Jul 2, 2024
| @@ -73,3 +73,6 @@ check_cxx_compiler_flag("-ftrivial-auto-var-init=pattern" LIBC_CC_SUPPORTS_PATTE | |||
|
|
|||
| # clang-6+, gcc-13+ | |||
| check_cxx_compiler_flag("-nostdlib++" LIBC_CC_SUPPORTS_NOSTDLIBPP) | |||
|
|
|||
| # clang-3.0+ | |||
| check_c_compiler_flag("-nostdlibinc" LIBC_C_SUPPORTS_NOSTDLIBINC) | |||
There was a problem hiding this comment.
Suggested change
| check_c_compiler_flag("-nostdlibinc" LIBC_C_SUPPORTS_NOSTDLIBINC) | |
| check_c_compiler_flag("-nostdlibinc" LIBC_C_SUPPORTS_NOSTDLIBINC) |
Isn't this a CXX project? Wouldn't make sense to require both C and CXX compiler to be set and match if so.
jhuber6
approved these changes
Jul 2, 2024
lntue
approved these changes
Jul 2, 2024
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/71/builds/1322 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/171/builds/1283 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/131/builds/1289 Here is the relevant piece of the build log for the reference: |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/179/builds/1289 Here is the relevant piece of the build log for the reference: |
|
Seems to be all the headers that |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/183/builds/826 Here is the relevant piece of the build log for the reference: |
petrhosek
added a commit
to petrhosek/llvm-project
that referenced
this pull request
Jul 2, 2024
When doing a full build for Linux, as of llvm#97461 we no longer include system headers, but we need to include Linux kernel headers.
michaelrj-google
pushed a commit
that referenced
this pull request
Jul 2, 2024
When doing a full build for Linux, as of #97461 we no longer include system headers, but we need to include Linux kernel headers.
lravenclaw
pushed a commit
to lravenclaw/llvm-project
that referenced
this pull request
Jul 3, 2024
This avoids accidentally including system headers.
lravenclaw
pushed a commit
to lravenclaw/llvm-project
that referenced
this pull request
Jul 3, 2024
When doing a full build for Linux, as of llvm#97461 we no longer include system headers, but we need to include Linux kernel headers.
kbluck
pushed a commit
to kbluck/llvm-project
that referenced
this pull request
Jul 6, 2024
This avoids accidentally including system headers.
kbluck
pushed a commit
to kbluck/llvm-project
that referenced
this pull request
Jul 6, 2024
When doing a full build for Linux, as of llvm#97461 we no longer include system headers, but we need to include Linux kernel headers.
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.
This avoids accidentally including system headers.