This is an archive of the discontinued LLVM Phabricator instance.

Differential D28579

[CMake][compiler-rt] Mark libcxx build for tsan as standalone
ClosedPublic

Authored by phosek on Jan 11 2017, 2:50 PM.

Details

Reviewers
krasin
EricWF
beanz
Commits
rGd7e4ed3bc3c9: [CMake][compiler-rt] Mark libcxx build for tsan as standalone
rCRT291722: [CMake][compiler-rt] Mark libcxx build for tsan as standalone
rL291722: [CMake][compiler-rt] Mark libcxx build for tsan as standalone
Summary

This is to ensure that the libcxx build is properly configured.

Diff Detail

Repository
rL LLVM

Event Timeline

phosek updated this revision to Diff 84027.Jan 11 2017, 2:50 PM
phosek retitled this revision from to [CMake][compiler-rt] Mar libcxx build for tsan as standalone.
phosek updated this object.
phosek added reviewers: beanz, krasin.
phosek set the repository for this revision to rL LLVM.
phosek added a subscriber: llvm-commits.
Herald added a reviewer: EricWF. · View Herald TranscriptJan 11 2017, 2:50 PM
Herald added subscribers: mgorny, dberris. · View Herald Transcript
phosek retitled this revision from [CMake][compiler-rt] Mar libcxx build for tsan as standalone to [CMake][compiler-rt] Mark libcxx build for tsan as standalone.Jan 11 2017, 2:50 PM
phosek edited edge metadata.
aizatsky added a subscriber: aizatsky.Jan 11 2017, 3:10 PM
krasin accepted this revision.Jan 11 2017, 3:16 PM
krasin edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jan 11 2017, 3:16 PM
phosek mentioned this in D28580: [CMake][libcxx] Check that we have libcxxabi before using it.Jan 11 2017, 3:17 PM
Closed by commit rL291722: [CMake][compiler-rt] Mark libcxx build for tsan as standalone (authored by phosek). · Explain WhyJan 11 2017, 3:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cmake/
Modules/
1 line

Diff 84027

cmake/Modules/AddCompilerRT.cmake

Show First 20 Lines • Show All 374 Lines • ▼ Show 20 Lines ExternalProject_Add(${name}
CMAKE_ARGS -DCMAKE_MAKE_PROGRAM:STRING=${CMAKE_MAKE_PROGRAM} CMAKE_ARGS -DCMAKE_MAKE_PROGRAM:STRING=${CMAKE_MAKE_PROGRAM}
-DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER} -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER}
-DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_CXX_COMPILER} -DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_CXX_COMPILER}
-DCMAKE_C_FLAGS=${LIBCXX_CFLAGS} -DCMAKE_C_FLAGS=${LIBCXX_CFLAGS}
-DCMAKE_CXX_FLAGS=${LIBCXX_CFLAGS} -DCMAKE_CXX_FLAGS=${LIBCXX_CFLAGS}
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DLLVM_PATH=${LLVM_MAIN_SRC_DIR} -DLLVM_PATH=${LLVM_MAIN_SRC_DIR}
-DLIBCXX_STANDALONE_BUILD=On
LOG_BUILD 1 LOG_BUILD 1
LOG_CONFIGURE 1 LOG_CONFIGURE 1
LOG_INSTALL 1 LOG_INSTALL 1
) )
set_target_properties(${name} PROPERTIES EXCLUDE_FROM_ALL TRUE) set_target_properties(${name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
ExternalProject_Add_Step(${name} force-reconfigure ExternalProject_Add_Step(${name} force-reconfigure
DEPENDERS configure DEPENDERS configure
Show All 36 Lines