projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce2474f
)
cmake: Fix build with -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON
author
Tom Stellard
<tstellar@redhat.com>
Thu, 10 Nov 2022 00:31:01 +0000
(
00:31
+0000)
committer
Tom Stellard
<tstellar@redhat.com>
Thu, 10 Nov 2022 01:00:08 +0000
(17:00 -0800)
This was broken by
a11cd0d94ed3cabf0998a0289aead05da94c86eb
.
compiler-rt/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/compiler-rt/CMakeLists.txt
b/compiler-rt/CMakeLists.txt
index
c722d34
..
f6b1f1a
100644
(file)
--- a/
compiler-rt/CMakeLists.txt
+++ b/
compiler-rt/CMakeLists.txt
@@
-639,6
+639,12
@@
elseif (SANITIZER_TEST_CXX_LIBNAME STREQUAL "libstdc++")
endif()
# Unittests support.
+# FIXME: When compiler-rt is build using -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON, then
+# The LLVM_THIRD_PARTY_DIR variable is not set.
+if (NOT LLVM_THIRD_PARTY_DIR)
+ set(LLVM_THIRD_PARTY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../third-party")
+endif()
+
set(COMPILER_RT_GTEST_PATH ${LLVM_THIRD_PARTY_DIR}/unittest/googletest)
set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc)
set(COMPILER_RT_GTEST_CFLAGS