This is an archive of the discontinued LLVM Phabricator instance.

Differential D49629

[CMake] Fix the setting of LIBCXX_HEADER_DIR
ClosedPublic

Authored by aheejin on Jul 20 2018, 9:17 PM.

Details

Reviewers
phosek
Commits
rGe55940115904: [CMake] Fix the setting of LIBCXX_HEADER_DIR
rCXX337727: [CMake] Fix the setting of LIBCXX_HEADER_DIR
rL337727: [CMake] Fix the setting of LIBCXX_HEADER_DIR

Diff Detail

Event Timeline

aheejin created this revision.Jul 20 2018, 9:17 PM
Herald added subscribers: cfe-commits, ldionne, christof, mgorny. · View Herald TranscriptJul 20 2018, 9:17 PM
Harbormaster completed remote builds in B20584: Diff 156659.Jul 20 2018, 9:17 PM
aheejin added a comment.Jul 20 2018, 9:18 PM

This line was added in rL335809, and after rL337630 dst in this line is set to NULL in our local libcxx build. I think this should have been LIBCXX_BINARY_DIR, right?

keith.walker.arm added a subscriber: keith.walker.arm.Jul 23 2018, 7:29 AM

This change fixed a failing build here, so it looks correct to me.

aheejin added a comment.Jul 23 2018, 10:48 AM

Ping

phosek accepted this revision.Jul 23 2018, 11:24 AM

LGTM

This revision is now accepted and ready to land.Jul 23 2018, 11:24 AM
Closed by commit rL337727: [CMake] Fix the setting of LIBCXX_HEADER_DIR (authored by aheejin). · Explain WhyJul 23 2018, 11:58 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJul 23 2018, 11:58 AM
tra mentioned this in rL337753: [CUDA, test-suite] Adjust path to libc++ headers in clang's build dir..Jul 23 2018, 3:09 PM
tra mentioned this in rOLDT337753: [CUDA, test-suite] Adjust path to libc++ headers in clang's build dir..Jul 23 2018, 3:15 PM
morehouse added a subscriber: morehouse.Jul 23 2018, 4:35 PM

Revision Contents

PathSize
2 lines

Diff 156659

CMakeLists.txt

Show First 20 Lines • Show All 372 Lines • ▼ Show 20 Lines
#=============================================================================== #===============================================================================
# Configure System # Configure System
#=============================================================================== #===============================================================================
set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER}) set(LIBCXX_COMPILER ${CMAKE_CXX_COMPILER})
set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(LIBCXX_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXX_HEADER_DIR ${LIBCXX_BINARY_DIR})
set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION
${PACKAGE_VERSION}) ${PACKAGE_VERSION})
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
set(DEFAULT_INSTALL_PREFIX lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/${LLVM_DEFAULT_TARGET_TRIPLE}/) set(DEFAULT_INSTALL_PREFIX lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/${LLVM_DEFAULT_TARGET_TRIPLE}/)
set(DEFAULT_INSTALL_HEADER_PREFIX lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/) set(DEFAULT_INSTALL_HEADER_PREFIX lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/)
▲ Show 20 Lines • Show All 347 Lines • Show Last 20 Lines