This is an archive of the discontinued LLVM Phabricator instance.

Differential D97399

[libcxx] [cmake] Add asm to the runtimes build languages
ClosedPublic

Authored by mstorsjo on Feb 24 2021, 9:45 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rG72fe14d40a52: [libcxx] [cmake] Add asm to the runtimes build languages
Summary

This fixes building libunwind with a new enough version of cmake.

(libunwind treats its asm sources as C depending on the cmake version on some platforms; this fixes builds when such workarounds aren't used, when cmake treats asm correctly on its own.)

Diff Detail

Event Timeline

mstorsjo created this revision.Feb 24 2021, 9:45 AM
Herald added subscribers: arichardson, mgorny. · View Herald TranscriptFeb 24 2021, 9:45 AM
mstorsjo requested review of this revision.Feb 24 2021, 9:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 24 2021, 9:45 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B90632: Diff 326123.Feb 24 2021, 11:45 AM
ldionne accepted this revision.Feb 25 2021, 11:27 AM

Note that this "runtimes" build should really be replaced by the real runtimes build under <monorepo>/runtimes. This was only a stop-gap to get stuff working at some point.

This revision is now accepted and ready to land.Feb 25 2021, 11:27 AM
Closed by commit rG72fe14d40a52: [libcxx] [cmake] Add asm to the runtimes build languages (authored by mstorsjo). · Explain WhyFeb 25 2021, 2:11 PM
This revision was automatically updated to reflect the committed changes.
mstorsjo added a commit: rG72fe14d40a52: [libcxx] [cmake] Add asm to the runtimes build languages.

Revision Contents

PathSize
libcxx/
utils/
ci/
runtimes/
2 lines

Diff 326498

libcxx/utils/ci/runtimes/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
project(LLVM_RUNTIMES) project(LLVM_RUNTIMES C CXX ASM)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND) if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback") message(WARNING "Python3 not found, using python2 as a fallback")
find_package(Python2 COMPONENTS Interpreter REQUIRED) find_package(Python2 COMPONENTS Interpreter REQUIRED)
if(Python2_VERSION VERSION_LESS 2.7) if(Python2_VERSION VERSION_LESS 2.7)
Show All 36 Lines