[compiler-rt] Fix build breakage #96235
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
Add missing flags in Cmake. Follow-up to cae6d45.
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Alexander Shaposhnikov (alexander-shaposhnikov) ChangesAdd missing flags in Cmake. Full diff: https://github.com/llvm/llvm-project/pull/96235.diff 1 Files Affected:
diff --git a/compiler-rt/lib/nsan/tests/CMakeLists.txt b/compiler-rt/lib/nsan/tests/CMakeLists.txt
index e6674e12b548b..3d962e70a7bf0 100644
--- a/compiler-rt/lib/nsan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/nsan/tests/CMakeLists.txt
@@ -3,12 +3,19 @@ include(CompilerRTCompile)
set(NSAN_UNITTEST_CFLAGS
${COMPILER_RT_UNITTEST_CFLAGS}
${COMPILER_RT_GTEST_CFLAGS}
- -I${COMPILER_RT_SOURCE_DIR}/lib/
+ ${SANITIZER_TEST_CXX_CFLAGS}
+ -I${COMPILER_RT_SOURCE_DIR}/include
+ -I${COMPILER_RT_SOURCE_DIR}/lib
-DSANITIZER_COMMON_REDEFINE_BUILTINS_IN_STD
-O2
-g
-fno-omit-frame-pointer)
+set(NSAN_UNITTEST_LINK_FLAGS
+ ${COMPILER_RT_UNITTEST_LINK_FLAGS}
+ ${COMPILER_RT_UNWINDER_LINK_LIBS}
+ ${SANITIZER_TEST_CXX_LIBRARIES})
+
file(GLOB NSAN_HEADERS ../*.h)
set(NSAN_UNITTESTS
NSanUnitTest.cpp
|
ilovepi
approved these changes
Jun 20, 2024
There was a problem hiding this comment.
LGTM, since the looks like it passes in our CI now. https://ci.chromium.org/raw/build/logs.chromium.org/fuchsia/led/paulkirth_google.com/bf7ddc6c904a002506f06eb01a2825431aea8ac54af43937d01df33fa27de34e/+/build.proto?server=chromium-swarm.appspot.com
vitalybuka
approved these changes
Jun 21, 2024
AlexisPerry
pushed a commit
to llvm-project-tlp/llvm-project
that referenced
this pull request
Jul 9, 2024
Add missing flags in cmake. Follow-up to cae6d45.
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.
Add missing flags in cmake.
Follow-up to cae6d45.