This is an archive of the discontinued LLVM Phabricator instance.

Differential D58372

[compiler-rt][CMake] Set project for the custom libc++
ClosedPublic

Authored by phosek on Feb 18 2019, 10:48 PM.

Details

Reviewers
Hahnfeld
EricWF
Commits
rCRT354350: [compiler-rt][CMake] Set project for the custom libc++
rGa94e6d70f14f: [compiler-rt][CMake] Set project for the custom libc++
rL354350: [compiler-rt][CMake] Set project for the custom libc++
Summary

This is another follow up to r354212 which is broken on Darwin when
cross-compiling runtimes to Linux when it ignores the -fuse-ld=lld
linker flag and attempts to use the host linker when performing the
compiler identification. Upon investigation, I noticed that setting
the project with appropriate list of languages makes the error go
away and it shouldn't hurt either.

Diff Detail

Event Timeline

phosek created this revision.Feb 18 2019, 10:48 PM
Herald added a reviewer: EricWF. · View Herald TranscriptFeb 18 2019, 10:48 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, Restricted Project, jdoerfert and 3 others. · View Herald Transcript
phosek added a comment.Feb 18 2019, 10:48 PM

The error can be seen here in case you're interested: https://logs.chromium.org/logs/fuchsia/buildbucket/cr-buildbucket.appspot.com/8921132982300473968/+/steps/clang/0/steps/distribution/0/stdout

Hahnfeld accepted this revision.Feb 19 2019, 12:04 AM

LG if that fixes the problem. For the record llvm/runtimes/ does the same.

I wonder if we should still set LIBCXXABI_STANDALONE_BUILD and LIBCXX_STANDALONE_BUILD. I added them because that defines PACKAGE_VERSION, but maybe we should pass that variable through?

This revision is now accepted and ready to land.Feb 19 2019, 12:04 AM
Closed by commit rL354350: [compiler-rt][CMake] Set project for the custom libc++ (authored by phosek). · Explain WhyFeb 19 2019, 8:53 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: delcypher. · View Herald TranscriptFeb 19 2019, 8:53 AM

Revision Contents

PathSize
compiler-rt/
cmake/
Modules/
CustomLibcxx/
1 line

Diff 187309

compiler-rt/cmake/Modules/CustomLibcxx/CMakeLists.txt

cmake_minimum_required(VERSION 3.4.3) cmake_minimum_required(VERSION 3.4.3)
project(custom-libcxx C CXX)
# Build static libcxxabi. # Build static libcxxabi.
set(LIBCXXABI_STANDALONE_BUILD 1) set(LIBCXXABI_STANDALONE_BUILD 1)
set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "") set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "")
set(LIBCXXABI_HERMETIC_STATIC_LIBRARY ON CACHE STRING "") set(LIBCXXABI_HERMETIC_STATIC_LIBRARY ON CACHE STRING "")
set(LIBCXXABI_LIBCXX_PATH ${COMPILER_RT_LIBCXX_PATH} CACHE PATH "") set(LIBCXXABI_LIBCXX_PATH ${COMPILER_RT_LIBCXX_PATH} CACHE PATH "")
set(LIBCXXABI_INCLUDE_TESTS OFF CACHE BOOL "") set(LIBCXXABI_INCLUDE_TESTS OFF CACHE BOOL "")
add_subdirectory(${COMPILER_RT_LIBCXXABI_PATH} ${CMAKE_CURRENT_BINARY_DIR}/cxxabi) add_subdirectory(${COMPILER_RT_LIBCXXABI_PATH} ${CMAKE_CURRENT_BINARY_DIR}/cxxabi)
Show All 15 Lines