This is an archive of the discontinued LLVM Phabricator instance.

Differential D49825

[CMake] Don't use LIBCXXABI_ENABLE_STATIC option before its declared
ClosedPublic

Authored by sbc100 on Jul 25 2018, 3:59 PM.

Details

Reviewers
phosek
aheejin
Commits
rG77c99ee5d9f6: [CMake] Don't use LIBCXXABI_ENABLE_STATIC option before its declared
rCXXA337982: [CMake] Don't use LIBCXXABI_ENABLE_STATIC option before its declared
rL337982: [CMake] Don't use LIBCXXABI_ENABLE_STATIC option before its declared
Summary

rL337867 introduced two new cmake_dependent_option options:

  • LIBCXXABI_INSTALL_STATIC_LIBRARY
  • LIBCXXABI_INSTALL_SHARED_LIBRARY

They depend on LIBCXXABI_ENABLE_STATIC and LIBCXXABI_ENABLE_SHARED
and so therefore need to (it seems) come after the declaration of
these two options.

Diff Detail

Repository
rL LLVM

Event Timeline

sbc100 created this revision.Jul 25 2018, 3:59 PM
Herald added subscribers: cfe-commits, ldionne, christof and 2 others. · View Herald TranscriptJul 25 2018, 3:59 PM
Harbormaster completed remote builds in B20713: Diff 157384.Jul 25 2018, 3:59 PM
sbc100 added a reviewer: phosek.Jul 25 2018, 3:59 PM
sbc100 added a reviewer: aheejin.
phosek accepted this revision.Jul 25 2018, 4:05 PM

LGTM, thanks!

This revision is now accepted and ready to land.Jul 25 2018, 4:05 PM
aheejin accepted this revision.Jul 25 2018, 4:10 PM
Closed by commit rL337982: [CMake] Don't use LIBCXXABI_ENABLE_STATIC option before its declared (authored by sbc). · Explain WhyJul 25 2018, 4:13 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJul 25 2018, 4:13 PM

Revision Contents

PathSize
libcxxabi/
trunk/
14 lines

Diff 157390

libcxxabi/trunk/CMakeLists.txt

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Lines
set(LIBCXXABI_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING set(LIBCXXABI_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}" CACHE STRING
"Define suffix of library directory name (32/64)") "Define suffix of library directory name (32/64)")
option(LIBCXXABI_INSTALL_LIBRARY "Install the libc++abi library." ON) option(LIBCXXABI_INSTALL_LIBRARY "Install the libc++abi library." ON)
set(LIBCXXABI_TARGET_TRIPLE "" CACHE STRING "Target triple for cross compiling.") set(LIBCXXABI_TARGET_TRIPLE "" CACHE STRING "Target triple for cross compiling.")
set(LIBCXXABI_GCC_TOOLCHAIN "" CACHE PATH "GCC toolchain for cross compiling.") set(LIBCXXABI_GCC_TOOLCHAIN "" CACHE PATH "GCC toolchain for cross compiling.")
set(LIBCXXABI_SYSROOT "" CACHE PATH "Sysroot for cross compiling.") set(LIBCXXABI_SYSROOT "" CACHE PATH "Sysroot for cross compiling.")
set(LIBCXXABI_LIBCXX_LIBRARY_PATH "" CACHE PATH "The path to libc++ library.") set(LIBCXXABI_LIBCXX_LIBRARY_PATH "" CACHE PATH "The path to libc++ library.")
cmake_dependent_option(LIBCXXABI_INSTALL_STATIC_LIBRARY
"Install the static libc++abi library." ON
"LIBCXXABI_ENABLE_STATIC;LIBCXXABI_INSTALL_LIBRARY" OFF)
cmake_dependent_option(LIBCXXABI_INSTALL_SHARED_LIBRARY
"Install the shared libc++abi library." ON
"LIBCXXABI_ENABLE_SHARED;LIBCXXABI_INSTALL_LIBRARY" OFF)
# Default to building a shared library so that the default options still test # Default to building a shared library so that the default options still test
# the libc++abi that is being built. There are two problems with testing a # the libc++abi that is being built. There are two problems with testing a
# static libc++abi. In the case of a standalone build, the tests will link the # static libc++abi. In the case of a standalone build, the tests will link the
# system's libc++, which might not have been built against our libc++abi. In the # system's libc++, which might not have been built against our libc++abi. In the
# case of an in tree build, libc++ will prefer a dynamic libc++abi from the # case of an in tree build, libc++ will prefer a dynamic libc++abi from the
# system over a static libc++abi from the output directory. # system over a static libc++abi from the output directory.
option(LIBCXXABI_ENABLE_SHARED "Build libc++abi as a shared library." ON) option(LIBCXXABI_ENABLE_SHARED "Build libc++abi as a shared library." ON)
option(LIBCXXABI_ENABLE_STATIC "Build libc++abi as a static library." ON) option(LIBCXXABI_ENABLE_STATIC "Build libc++abi as a static library." ON)
cmake_dependent_option(LIBCXXABI_INSTALL_STATIC_LIBRARY
"Install the static libc++abi library." ON
"LIBCXXABI_ENABLE_STATIC;LIBCXXABI_INSTALL_LIBRARY" OFF)
cmake_dependent_option(LIBCXXABI_INSTALL_SHARED_LIBRARY
"Install the shared libc++abi library." ON
"LIBCXXABI_ENABLE_SHARED;LIBCXXABI_INSTALL_LIBRARY" OFF)
cmake_dependent_option(LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY cmake_dependent_option(LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY
"Statically link the LLVM unwinder to static library" ON "Statically link the LLVM unwinder to static library" ON
"LIBCXXABI_ENABLE_STATIC_UNWINDER;LIBCXXABI_ENABLE_STATIC" OFF) "LIBCXXABI_ENABLE_STATIC_UNWINDER;LIBCXXABI_ENABLE_STATIC" OFF)
cmake_dependent_option(LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY cmake_dependent_option(LIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY
"Statically link the LLVM unwinder to shared library" ON "Statically link the LLVM unwinder to shared library" ON
"LIBCXXABI_ENABLE_STATIC_UNWINDER;LIBCXXABI_ENABLE_SHARED" OFF) "LIBCXXABI_ENABLE_STATIC_UNWINDER;LIBCXXABI_ENABLE_SHARED" OFF)
option(LIBCXXABI_BAREMETAL "Build libc++abi for baremetal targets." OFF) option(LIBCXXABI_BAREMETAL "Build libc++abi for baremetal targets." OFF)
▲ Show 20 Lines • Show All 386 Lines • Show Last 20 Lines