This is an archive of the discontinued LLVM Phabricator instance.

Differential D58745

[CMake][libunwind] Define add_target_flags which is missing
ClosedPublic

Authored by phosek on Feb 27 2019, 3:33 PM.

Details

Reviewers
ldionne
smeenai
arichardson
Commits
rUNW355142: [CMake][libunwind] Define add_target_flags which is missing
rGdc1b8e9f4478: [CMake][libunwind] Define add_target_flags which is missing
rL355142: [CMake][libunwind] Define add_target_flags which is missing
Summary

It's use was introduced in r353084 but its definition is missing.

Diff Detail

Repository
rUNW libunwind

Event Timeline

phosek created this revision.Feb 27 2019, 3:33 PM
Herald added subscribers: libcxx-commits, christof, mgorny. · View Herald TranscriptFeb 27 2019, 3:33 PM
phosek mentioned this in D57670: [CMake] Support CMake variables for setting target, sysroot and toolchain.Feb 27 2019, 3:33 PM
smeenai added a subscriber: smeenai.Feb 27 2019, 3:38 PM
smeenai added inline comments.
libunwind/CMakeLists.txt
221–222

These should be LIBUNWIND_*, right?

phosek updated this revision to Diff 188643.Feb 27 2019, 3:59 PM
phosek marked an inline comment as done.
phosek added a reviewer: smeenai.Feb 27 2019, 5:29 PM
smeenai accepted this revision.Feb 27 2019, 11:16 PM

LGTM

This revision is now accepted and ready to land.Feb 27 2019, 11:16 PM
arichardson accepted this revision.Feb 28 2019, 12:43 AM
arichardson added a subscriber: arichardson.

LGTM

Closed by commit rL355142: [CMake][libunwind] Define add_target_flags which is missing (authored by phosek). · Explain WhyFeb 28 2019, 1:38 PM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptFeb 28 2019, 1:38 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
libunwind/
16 lines

Diff 188636

libunwind/CMakeLists.txt

Show First 20 Lines • Show All 208 Lines • ▼ Show 20 Lines
# Get required flags. # Get required flags.
macro(unwind_append_if list condition var) macro(unwind_append_if list condition var)
if (${condition}) if (${condition})
list(APPEND ${list} ${var}) list(APPEND ${list} ${var})
endif() endif()
endmacro() endmacro()
macro(add_target_flags_if condition var) macro(add_target_flags)
foreach(value ${ARGN})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${value}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${value}")
list(APPEND LIBCXX_COMPILE_FLAGS ${value})
list(APPEND LIBCXX_LINK_FLAGS ${value})
smeenaiUnsubmitted
Done
ReplyInline Actions

These should be LIBUNWIND_*, right?

smeenai: These should be LIBUNWIND_*, right?
endforeach()
endmacro()
macro(add_target_flags_if condition)
if (${condition}) if (${condition})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${var}") add_target_flags(${ARGN})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${var}")
list(APPEND LIBUNWIND_COMPILE_FLAGS ${var})
list(APPEND LIBUNWIND_LINK_FLAGS ${var})
endif() endif()
endmacro() endmacro()
add_target_flags_if(LIBUNWIND_BUILD_32_BITS "-m32") add_target_flags_if(LIBUNWIND_BUILD_32_BITS "-m32")
if(LIBUNWIND_TARGET_TRIPLE) if(LIBUNWIND_TARGET_TRIPLE)
add_target_flags("--target=${LIBUNWIND_TARGET_TRIPLE}") add_target_flags("--target=${LIBUNWIND_TARGET_TRIPLE}")
elseif(CMAKE_CXX_COMPILER_TARGET) elseif(CMAKE_CXX_COMPILER_TARGET)
▲ Show 20 Lines • Show All 137 Lines • Show Last 20 Lines