File tree Expand file tree Collapse file tree 4 files changed +3
-6
lines changed Expand file tree Collapse file tree 4 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ set(CMAKE_FOLDER "libc++")
1919
2020set (LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} )
2121set (LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} )
22- set (LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR} /include/c++build" )
2322
2423include (GNUInstallDirs)
2524include (WarningFlags)
@@ -443,8 +442,6 @@ else()
443442 "Path where target-specific libc++ headers should be installed." )
444443endif ()
445444
446- file (MAKE_DIRECTORY "${LIBCXX_BINARY_INCLUDE_DIR} " )
447-
448445set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR} )
449446set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR} )
450447set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LIBCXX_LIBRARY_DIR} )
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ config.name = os.path.basename('@LIBCXX_TEST_CONFIG@')
2020config.test_source_root = os.path.join('@LIBCXX_SOURCE_DIR@', 'test')
2121config.test_format = libcxx.test.format.CxxStandardLibraryTest()
2222config.recursiveExpansionLimit = 10
23- config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR @', 'test')
23+ config.test_exec_root = os.path.join('@LIBCXX_BINARY_DIR @', 'test')
2424
2525# Add substitutions for bootstrapping the test suite configuration
2626config.substitutions.append(('%{libcxx-dir}', '@LIBCXX_SOURCE_DIR@'))
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ config.name = os.path.basename('@LIBCXXABI_TEST_CONFIG@')
2121config.test_source_root = os.path.join('@LIBCXXABI_SOURCE_DIR@', 'test')
2222config.test_format = libcxx.test.format.CxxStandardLibraryTest()
2323config.recursiveExpansionLimit = 10
24- config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR @', 'test')
24+ config.test_exec_root = os.path.join('@LIBCXXABI_BINARY_DIR @', 'test')
2525
2626# TODO: This is a non-standard Lit attribute and we should have another way of accessing this.
2727config.host_triple = '@LLVM_HOST_TRIPLE@'
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ config.name = os.path.basename('@LIBUNWIND_TEST_CONFIG@')
2020config.test_source_root = os.path.join('@LIBUNWIND_SOURCE_DIR@', 'test')
2121config.test_format = libcxx.test.format.CxxStandardLibraryTest()
2222config.recursiveExpansionLimit = 10
23- config.test_exec_root = os.path.join('@CMAKE_BINARY_DIR @', 'test')
23+ config.test_exec_root = os.path.join('@LIBUNWIND_BINARY_DIR @', 'test')
2424
2525# Add a few features that are common to all the configurations
2626if @LIBUNWIND_USES_ARM_EHABI@:
You can’t perform that action at this time.
0 commit comments