[compiler-rt][NFC] Apply -nostdinc++ only to C++ source in profile runtime #139038
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
|
@llvm/pr-subscribers-pgo Author: Wang Qiang (ReVe1uv) ChangesAvoid passing the C++-specific We only need Full diff: https://github.com/llvm/llvm-project/pull/139038.diff 1 Files Affected:
diff --git a/compiler-rt/lib/profile/CMakeLists.txt b/compiler-rt/lib/profile/CMakeLists.txt
index ac1451c8ceed1..2a6a79a41cb97 100644
--- a/compiler-rt/lib/profile/CMakeLists.txt
+++ b/compiler-rt/lib/profile/CMakeLists.txt
@@ -142,7 +142,13 @@ if(MSVC)
endif()
# We don't use the C++ Standard Library here, so avoid including it by mistake.
-append_list_if(COMPILER_RT_HAS_NOSTDINCXX_FLAG -nostdinc++ EXTRA_FLAGS)
+if(COMPILER_RT_HAS_NOSTDINCXX_FLAG)
+ set_source_files_properties(
+ InstrProfilingRuntime.cpp
+ PROPERTIES
+ COMPILE_FLAGS "-nostdinc++"
+ )
+endif()
# XRay uses C++ standard library headers.
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
ReVe1uv
force-pushed
the
compiler-rt-warning-fix
branch
2 times, most recently
from
efe9453 to
83a1734
Compare
…ntime Avoid passing the C++-specific `-nostdinc++` flag to C source files in the profile runtime library, which triggers warnings when building with GCC: cc1: warning: command-line option ‘-nostdinc++’ is valid for C++/ObjC++ but not for C We only need `-nostdinc++` for `InstrProfilingRuntime.cpp` to prevent accidental inclusion of the C++ standard library headers. This patch scopes the flag to that file using `set_properties()` and removes the flag from the global `EXTRA_FLAGS`.
ReVe1uv
force-pushed
the
compiler-rt-warning-fix
branch
from
83a1734 to
5a90df8
Compare
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.
Avoid passing the C++-specific
-nostdinc++flag to C source files in the profile runtime library, which triggers warnings when building with GCC:We only need
-nostdinc++forInstrProfilingRuntime.cppto prevent accidental inclusion of the C++ standard library headers. This patch scopes the flag to that file usingset_property()and removes the flag from the globalEXTRA_FLAGS.