maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Resubmit "Fix llvm-lit script generation in libcxx." 

After speaking with the libcxx owners, they agreed that this is
a bug in the bot that needs to be fixed by the bot owners, and
the CMake changes are correct.

llvm-svn: 313643
This commit is contained in:
Zachary Turner 2017-09-19 17:19:10 +00:00
parent 7bda2c6baf
commit 50105d2942
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcxx/CMakeLists.txt
View File

@ -653,6 +653,7 @@ endif()
# #
# However, since some submission systems strip test/ subdirectories, check for # However, since some submission systems strip test/ subdirectories, check for
# it before adding it. # it before adding it.
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/test") if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/test")
add_subdirectory(test) add_subdirectory(test)
endif() endif()
@ -660,6 +661,15 @@ if (LIBCXX_INCLUDE_TESTS)
add_subdirectory(lib/abi) add_subdirectory(lib/abi)
endif() endif()
if (LIBCXX_STANDALONE_BUILD AND EXISTS "${LLVM_MAIN_SRC_DIR}/utils/llvm-lit")
# Make sure the llvm-lit script is generated into the bin directory, and do
# it after adding all tests, since the generated script will only work
# correctly discovered tests against test locations from the source tree that
# have already been discovered.
add_subdirectory(${LLVM_MAIN_SRC_DIR}/utils/llvm-lit
${CMAKE_CURRENT_BINARY_DIR}/llvm-lit)
endif()
if (LIBCXX_INCLUDE_DOCS) if (LIBCXX_INCLUDE_DOCS)
add_subdirectory(docs) add_subdirectory(docs)
endif() endif()

5
libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
View File

@ -106,6 +106,11 @@ macro(configure_out_of_tree_llvm)
set(LLVM_ENABLE_SPHINX OFF) set(LLVM_ENABLE_SPHINX OFF)
endif() endif()
# In a standalone build, we don't have llvm to automatically generate the
# llvm-lit script for us. So we need to provide an explicit directory that
# the configurator should write the script into.
set(LLVM_LIT_OUTPUT_DIR "${libcxx_BINARY_DIR}/bin")
# Required LIT Configuration ------------------------------------------------ # Required LIT Configuration ------------------------------------------------
# Define the default arguments to use with 'lit', and an option for the user # Define the default arguments to use with 'lit', and an option for the user
# to override. # to override.

5
libcxx/test/CMakeLists.txt
View File

@ -49,10 +49,9 @@ set(LIBCXX_EXECUTOR "None" CACHE STRING
set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!") set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
configure_file( configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
@ONLY)
set(LIBCXX_TEST_DEPS "") set(LIBCXX_TEST_DEPS "")

6
llvm/cmake/modules/AddLLVM.cmake
View File

@ -1130,11 +1130,11 @@ function(configure_lit_site_cfg input output)
# They below might not be the build tree but provided binary tree. # They below might not be the build tree but provided binary tree.
set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR}) set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})
set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR}) set(LLVM_BINARY_DIR ${LLVM_BINARY_DIR})
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_TOOLS_DIR ${LLVM_TOOLS_BINARY_DIR}) string(REPLACE "${CMAKE_CFG_INTDIR}" "${LLVM_BUILD_MODE}" LLVM_TOOLS_DIR "${LLVM_TOOLS_BINARY_DIR}")
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR ${LLVM_LIBRARY_DIR}) string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLVM_LIBS_DIR "${LLVM_LIBRARY_DIR}")
# SHLIBDIR points the build tree. # SHLIBDIR points the build tree.
string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} SHLIBDIR "${LLVM_SHLIB_OUTPUT_INTDIR}") string(REPLACE "${CMAKE_CFG_INTDIR}" "${LLVM_BUILD_MODE}" SHLIBDIR "${LLVM_SHLIB_OUTPUT_INTDIR}")
set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
# FIXME: "ENABLE_SHARED" doesn't make sense, since it is used just for # FIXME: "ENABLE_SHARED" doesn't make sense, since it is used just for