2021-08-09 18:31:50 +00:00
|
|
|
From 4462799ee3c9e29a2eb2396d065c1c3caf1a3d0e Mon Sep 17 00:00:00 2001
|
2020-08-11 15:29:34 +00:00
|
|
|
From: Tom Stellard <tstellar@redhat.com>
|
|
|
|
|
Date: Tue, 11 Aug 2020 08:27:41 -0700
|
2021-08-09 18:31:50 +00:00
|
|
|
Subject: [PATCH 2/2] libcxxabi: Remove monorepo requirement
|
2020-08-11 15:29:34 +00:00
|
|
|
|
|
|
|
|
---
|
2021-02-17 20:33:49 +00:00
|
|
|
libcxxabi/CMakeLists.txt | 6 ------
|
|
|
|
|
1 file changed, 6 deletions(-)
|
2020-08-11 15:29:34 +00:00
|
|
|
|
|
|
|
|
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
|
2021-08-09 18:31:50 +00:00
|
|
|
index 9fb35860d483..abbdbfe7efaa 100644
|
2020-08-11 15:29:34 +00:00
|
|
|
--- a/libcxxabi/CMakeLists.txt
|
|
|
|
|
+++ b/libcxxabi/CMakeLists.txt
|
|
|
|
|
@@ -1,9 +1,5 @@
|
|
|
|
|
# See www/CMake.html for instructions on how to build libcxxabi with CMake.
|
|
|
|
|
|
|
|
|
|
-if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx")
|
|
|
|
|
- message(FATAL_ERROR "libc++abi now requires being built in a monorepo layout with libcxx available")
|
|
|
|
|
-endif()
|
|
|
|
|
-
|
|
|
|
|
#===============================================================================
|
|
|
|
|
# Setup Project
|
|
|
|
|
#===============================================================================
|
2021-02-17 20:33:49 +00:00
|
|
|
@@ -42,8 +38,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_B
|
|
|
|
|
set(LIBCXXABI_STANDALONE_BUILD 1)
|
|
|
|
|
set(LLVM_LIT_OUTPUT_DIR "${LIBCXXABI_BINARY_DIR}/bin")
|
|
|
|
|
|
|
|
|
|
- # Find the LLVM sources and simulate LLVM CMake options.
|
|
|
|
|
- include(HandleOutOfTreeLLVM)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if (LIBCXXABI_STANDALONE_BUILD)
|
2020-08-11 15:29:34 +00:00
|
|
|
--
|
2021-08-09 18:31:50 +00:00
|
|
|
2.27.0
|
2020-08-11 15:29:34 +00:00
|
|
|
|
