[libc++] Guard include of <features.h> with __has_include #127691
Merged
Conversation
This file contains hidden or 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
Some configurations define __AMDGPU__ or __NVPTX__ on platforms that don't provide <features.h>, such as CUDA on Mac.
llvmbot
added
the
libc++
jhuber6
approved these changes
Feb 18, 2025
Member
|
@llvm/pr-subscribers-libcxx Author: Louis Dionne (ldionne) ChangesSome configurations define AMDGPU or NVPTX on platforms that don't provide <features.h>, such as CUDA on Mac. Full diff: https://github.com/llvm/llvm-project/pull/127691.diff 1 Files Affected:
diff --git a/libcxx/include/__configuration/platform.h b/libcxx/include/__configuration/platform.h
index cff99376ee24b..8d0f8f63f5213 100644
--- a/libcxx/include/__configuration/platform.h
+++ b/libcxx/include/__configuration/platform.h
@@ -32,12 +32,14 @@
// Need to detect which libc we're using if we're on Linux.
#if defined(__linux__) || defined(__AMDGPU__) || defined(__NVPTX__)
-# include <features.h>
-# if defined(__GLIBC_PREREQ)
-# define _LIBCPP_GLIBC_PREREQ(a, b) __GLIBC_PREREQ(a, b)
-# else
-# define _LIBCPP_GLIBC_PREREQ(a, b) 0
-# endif // defined(__GLIBC_PREREQ)
+# if __has_include(<features.h>)
+# include <features.h>
+# if defined(__GLIBC_PREREQ)
+# define _LIBCPP_GLIBC_PREREQ(a, b) __GLIBC_PREREQ(a, b)
+# else
+# define _LIBCPP_GLIBC_PREREQ(a, b) 0
+# endif // defined(__GLIBC_PREREQ)
+# endif
#endif
#ifndef __BYTE_ORDER__
|
Contributor
|
Yeah, I forgot to mention that offloading compilations are weird. They like to define conflicting macros on both sides of the compilation to make things look the same. |
Member
Author
|
/cherry-pick 2c8b124 |
Member
|
Failed to cherry-pick: 2c8b124 https://github.com/llvm/llvm-project/actions/runs/13413622290 Please manually backport the fix and push it to your github fork. Once this is done, please create a pull request |
Member
Author
|
/cherry-pick 2c8b124 |
Member
|
/pull-request #127842 |
swift-ci
pushed a commit
to swiftlang/llvm-project
that referenced
this pull request
Feb 20, 2025
Some configurations define __AMDGPU__ or __NVPTX__ on platforms that don't provide <features.h>, such as CUDA on Mac. (cherry picked from commit 2c8b124)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Some configurations define AMDGPU or NVPTX on platforms that don't provide <features.h>, such as CUDA on Mac.