This is an archive of the discontinued LLVM Phabricator instance.

Differential D26360

[CMake] Get libunwind building under LLVM/runtimes
ClosedPublic

Authored by phosek on Nov 7 2016, 12:01 PM.

Details

Reviewers
compnerd
jroelofs
beanz
Commits
rG92e71965ad96: [CMake] Get libunwind building under LLVM/runtimes
rUNW286308: [CMake] Get libunwind building under LLVM/runtimes
rL286308: [CMake] Get libunwind building under LLVM/runtimes
Summary

The new LLVM runtimes directory requires the same conventions to be
followed across the runtime projects. These changes make libunwind
build under the runtimes subdirectory.




This patch contains the following changes:






    

  • Rename LLVM_CONFIG to LLVM_CONFIG_PATH
    • 

  • Check if compiler supports C++11 (required by libunwind)
    • 

Diff Detail
Repository 
rL LLVM 
Event Timeline
phosek updated this revision to Diff 77071.Nov 7 2016, 12:01 PM
phosek retitled this revision from  to [CMake] Get libunwind building under LLVM/runtimes.
phosek updated this object.
phosek added reviewers: beanz, compnerd, jroelofs.
phosek set the repository for this revision to rL LLVM.
phosek added a subscriber: llvm-commits.
Herald added a subscriber: mgorny.  ·  View Herald TranscriptNov 7 2016, 12:01 PM
beanz accepted this revision.Nov 7 2016, 4:26 PM
beanz edited edge metadata.
LGTM!
This revision is now accepted and ready to land.Nov 7 2016, 4:26 PM
Closed by commit rL286308: [CMake] Get libunwind building under LLVM/runtimes (authored by phosek).  ·  Explain WhyNov 8 2016, 3:12 PM
This revision was automatically updated to reflect the committed changes.
Revision Contents
PathSize
libunwind/
trunk/
10 lines
cmake/
5 lines
Diff 77274
libunwind/trunk/CMakeLists.txt
#===============================================================================
#===============================================================================

# Setup Project
# Setup Project

#===============================================================================
#===============================================================================




cmake_minimum_required(VERSION 3.4.3)
cmake_minimum_required(VERSION 3.4.3)




if (POLICY CMP0042)
if (POLICY CMP0042)

  cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default
  cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default

endif()
endif()




if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

  project(libunwind)
  project(libunwind)




  # Rely on llvm-config.
  # Rely on llvm-config.

  set(CONFIG_OUTPUT)
  set(CONFIG_OUTPUT)

  find_program(LLVM_CONFIG "llvm-config")
  if(NOT LLVM_CONFIG_PATH)

    find_program(LLVM_CONFIG_PATH "llvm-config")

  endif()

  if (DEFINED LLVM_PATH)
  if (DEFINED LLVM_PATH)

    set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIR} CACHE PATH "Path to llvm/include")
    set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIR} CACHE PATH "Path to llvm/include")

    set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree")
    set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree")

    set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})
    set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})

    set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")
    set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")

  elseif (LLVM_CONFIG)
  elseif(LLVM_CONFIG_PATH)

    message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")
    message(STATUS "Found LLVM_CONFIG_PATH as ${LLVM_CONFIG_PATH}")

    set(CONFIG_COMMAND ${LLVM_CONFIG} "--includedir" "--prefix" "--src-root")
    set(CONFIG_COMMAND ${LLVM_CONFIG_PATH} "--includedir" "--prefix" "--src-root")

    execute_process(COMMAND ${CONFIG_COMMAND}
    execute_process(COMMAND ${CONFIG_COMMAND}

                    RESULT_VARIABLE HAD_ERROR
                    RESULT_VARIABLE HAD_ERROR

                    OUTPUT_VARIABLE CONFIG_OUTPUT)
                    OUTPUT_VARIABLE CONFIG_OUTPUT)

    if (NOT HAD_ERROR)
    if (NOT HAD_ERROR)

      string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";"
      string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";"

             CONFIG_OUTPUT ${CONFIG_OUTPUT})
             CONFIG_OUTPUT ${CONFIG_OUTPUT})

    else()
    else()

      string(REPLACE ";" " " CONFIG_COMMAND_STR "${CONFIG_COMMAND}")
      string(REPLACE ";" " " CONFIG_COMMAND_STR "${CONFIG_COMMAND}")

▲ Show 20 Lines • Show All 239 Lines • Show Last 20 Lines
libunwind/trunk/cmake/config-ix.cmake
Show All 32 Lines
check_cxx_compiler_flag(-Werror               LIBUNWIND_HAS_WERROR_FLAG)
check_cxx_compiler_flag(-Werror               LIBUNWIND_HAS_WERROR_FLAG)

check_cxx_compiler_flag(-Wno-error            LIBUNWIND_HAS_WNO_ERROR_FLAG)
check_cxx_compiler_flag(-Wno-error            LIBUNWIND_HAS_WNO_ERROR_FLAG)

check_cxx_compiler_flag(/WX                   LIBUNWIND_HAS_WX_FLAG)
check_cxx_compiler_flag(/WX                   LIBUNWIND_HAS_WX_FLAG)

check_cxx_compiler_flag(/WX-                  LIBUNWIND_HAS_NO_WX_FLAG)
check_cxx_compiler_flag(/WX-                  LIBUNWIND_HAS_NO_WX_FLAG)

check_cxx_compiler_flag(/EHsc                 LIBUNWIND_HAS_EHSC_FLAG)
check_cxx_compiler_flag(/EHsc                 LIBUNWIND_HAS_EHSC_FLAG)

check_cxx_compiler_flag(/EHs-                 LIBUNWIND_HAS_NO_EHS_FLAG)
check_cxx_compiler_flag(/EHs-                 LIBUNWIND_HAS_NO_EHS_FLAG)

check_cxx_compiler_flag(/EHa-                 LIBUNWIND_HAS_NO_EHA_FLAG)
check_cxx_compiler_flag(/EHa-                 LIBUNWIND_HAS_NO_EHA_FLAG)

check_cxx_compiler_flag(/GR-                  LIBUNWIND_HAS_NO_GR_FLAG)
check_cxx_compiler_flag(/GR-                  LIBUNWIND_HAS_NO_GR_FLAG)

check_cxx_compiler_flag(-std=c++11            LIBUNWIND_HAS_STD_CXX11)



if(LIBUNWIND_HAS_STD_CXX11)

  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

endif()




check_library_exists(c fopen "" LIBUNWIND_HAS_C_LIB)
check_library_exists(c fopen "" LIBUNWIND_HAS_C_LIB)

check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB)
check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB)

check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB)
check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB)