[Lldb-commits] [PATCH] D65862: Remove xcode-specific Config.h

[Pavel Labath via Phabricator via lldb-commits]

labath created this revision.
labath added reviewers: sgraenitz, beanz.
Herald added a subscriber: mgorny.

Now that the xcode project is removed, we no longer need/use the
hand-maintained Config.h file, as everything is configured through
cmake.

This patch deletes that file and reverts some of the changes from
r300372, which were made to support this use case.


https://reviews.llvm.org/D65862

Files:
  cmake/modules/LLDBConfig.cmake
  include/lldb/Host/Config.h


Index: include/lldb/Host/Config.h
===================================================================
--- include/lldb/Host/Config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//===-- Config.h ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_HOST_CONFIG_H
-#define LLDB_HOST_CONFIG_H
- 
-#if defined(__APPLE__)
-
-// This block of code only exists to keep the Xcode project working in the
-// absence of a configuration step.
-#define LLDB_LIBDIR_SUFFIX ""
-
-#define LLDB_CONFIG_TERMIOS_SUPPORTED 1
-
-#define LLDB_EDITLINE_USE_WCHAR 1
-
-#define LLDB_HAVE_EL_RFUNC_T 1
-
-#define HAVE_SYS_EVENT_H 1
-
-#define HAVE_PPOLL 0
-
-#define HAVE_SIGACTION 1
-
-#define HAVE_LIBCOMPRESSION 1
-
-#else
-
-#error This file is only used by the Xcode build.
-
-#endif
-
-#endif // #ifndef LLDB_HOST_CONFIG_H
Index: cmake/modules/LLDBConfig.cmake
===================================================================
--- cmake/modules/LLDBConfig.cmake
+++ cmake/modules/LLDBConfig.cmake
@@ -333,8 +333,8 @@
 message(STATUS "LLDB version: ${LLDB_VERSION}")
 
 include_directories(BEFORE
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_BINARY_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
   )
 
 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
@@ -345,7 +345,6 @@
     PATTERN "*.h"
     PATTERN ".svn" EXCLUDE
     PATTERN ".cmake" EXCLUDE
-    PATTERN "Config.h" EXCLUDE
     )
 
   install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65862.213855.patch
Type: text/x-patch
Size: 1745 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20190807/f05466a9/attachment-0001.bin>