This is an archive of the discontinued LLVM Phabricator instance.

Remove xcode-specific Config.h
ClosedPublic

Authored by labath on Aug 7 2019, 5:03 AM.

Download Raw Diff

Details

Reviewers

sgraenitz
beanz

Commits

rGbac7862c008e: Remove xcode-specific Config.h
rLLDB368266: Remove xcode-specific Config.h
rL368266: Remove xcode-specific Config.h

Summary

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.

Diff Detail

Repository: rL LLVM

Event Timeline

labath created this revision.Aug 7 2019, 5:03 AM

Herald added a subscriber: mgorny. · View Herald TranscriptAug 7 2019, 5:03 AM

Harbormaster completed remote builds in B36321: Diff 213855.Aug 7 2019, 5:05 AM

Originally introduced with D31969. LGTM. Maybe we can remove even more? (here or in future commits)

In D65862#1618740, @sgraenitz wrote:

Originally introduced with D31969. LGTM. Maybe we can remove even more? (here or in future commits)

I don't see what more could be removed here. Most of that patch was about setting up the infrastructure to generate the Config.h in the first place (instead of a bunch of hand-maintained files). That is still it use.

Right

This revision is now accepted and ready to land.Aug 7 2019, 5:23 AM

Closed by commit rL368266: Remove xcode-specific Config.h (authored by labath). · Explain WhyAug 8 2019, 1:28 AM

This revision was automatically updated to reflect the committed changes.

Herald added a project: Restricted Project. · View Herald TranscriptAug 8 2019, 1:29 AM

Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

Path

Size

lldb/

trunk/

cmake/

modules/

LLDBConfig.cmake

3 lines

include/

lldb/

Host/

Config.h

38 lines

Diff 214082

lldb/trunk/cmake/modules/LLDBConfig.cmake

	Show First 20 Lines • Show All 327 Lines • ▼ Show 20 Lines
	endif()			endif()
	if(NOT DEFINED LLDB_VERSION_SUFFIX)			if(NOT DEFINED LLDB_VERSION_SUFFIX)
	set(LLDB_VERSION_SUFFIX ${LLVM_VERSION_SUFFIX})			set(LLDB_VERSION_SUFFIX ${LLVM_VERSION_SUFFIX})
	endif()			endif()
	set(LLDB_VERSION "${LLDB_VERSION_MAJOR}.${LLDB_VERSION_MINOR}.${LLDB_VERSION_PATCH}${LLDB_VERSION_SUFFIX}")			set(LLDB_VERSION "${LLDB_VERSION_MAJOR}.${LLDB_VERSION_MINOR}.${LLDB_VERSION_PATCH}${LLDB_VERSION_SUFFIX}")
	message(STATUS "LLDB version: ${LLDB_VERSION}")			message(STATUS "LLDB version: ${LLDB_VERSION}")

	include_directories(BEFORE			include_directories(BEFORE
	${CMAKE_CURRENT_SOURCE_DIR}/include
	${CMAKE_CURRENT_BINARY_DIR}/include			${CMAKE_CURRENT_BINARY_DIR}/include
				${CMAKE_CURRENT_SOURCE_DIR}/include
	)			)

	if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)			if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
	install(DIRECTORY include/			install(DIRECTORY include/
	COMPONENT lldb-headers			COMPONENT lldb-headers
	DESTINATION include			DESTINATION include
	FILES_MATCHING			FILES_MATCHING
	PATTERN "*.h"			PATTERN "*.h"
	PATTERN ".svn" EXCLUDE			PATTERN ".svn" EXCLUDE
	PATTERN ".cmake" EXCLUDE			PATTERN ".cmake" EXCLUDE
	PATTERN "Config.h" EXCLUDE
	)			)

	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/			install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
	COMPONENT lldb-headers			COMPONENT lldb-headers
	DESTINATION include			DESTINATION include
	FILES_MATCHING			FILES_MATCHING
	PATTERN "*.h"			PATTERN "*.h"
	PATTERN ".svn" EXCLUDE			PATTERN ".svn" EXCLUDE
	▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines

lldb/trunk/include/lldb/Host/Config.h

	//===-- 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