Skip to content

Commit ef49338

Browse files
authored
Revert "Introduce and use SWIFT_HAVE_LIBEDIT"
1 parent 9cebf0a commit ef49338

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ set_property(GLOBAL PROPERTY JOB_POOL_LINK local_jobs)
1313

1414
# First include general CMake utilities.
1515
include(SwiftUtils)
16-
include(CheckSymbolExists)
1716

1817
#
1918
# User-configurable options that control the inclusion and default build
@@ -806,8 +805,6 @@ if(LIBXML2_FOUND)
806805
set(SWIFT_HAVE_LIBXML 1)
807806
endif()
808807

809-
check_symbol_exists(el_wgets "histedit.h" HAVE_UNICODE_LIBEDIT)
810-
811808
if (LLVM_ENABLE_DOXYGEN)
812809
message(STATUS "Doxygen: enabled")
813810
endif()

include/swift/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
include(CheckSymbolExists)
2+
3+
check_symbol_exists(el_wgets "histedit.h" HAVE_UNICODE_LIBEDIT)
4+
15
configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h
26
ESCAPE_QUOTES @ONLY)
37

tools/SourceKit/tools/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,5 @@ include_directories(
66

77
add_swift_lib_subdirectory(sourcekitd)
88
add_swift_tool_subdirectory(sourcekitd-test)
9-
if(HAVE_UNICODE_LIBEDIT)
10-
add_swift_tool_subdirectory(sourcekitd-repl)
11-
endif()
9+
add_swift_tool_subdirectory(sourcekitd-repl)
1210
add_swift_tool_subdirectory(complete-test)

tools/driver/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ add_swift_host_tool(swift
1212
SWIFT_COMPONENT compiler
1313
)
1414

15-
if(HAVE_UNICODE_LIBEDIT)
16-
target_link_libraries(swift edit)
17-
endif()
15+
target_link_libraries(swift edit)
1816

1917
add_custom_command(TARGET swift POST_BUILD
2018
COMMAND "${CMAKE_COMMAND}" "-E" "create_symlink" "swift" "swiftc"

tools/swift-remoteast-test/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ add_swift_host_tool(swift-remoteast-test
77
)
88

99
set_target_properties(swift-remoteast-test PROPERTIES ENABLE_EXPORTS 1)
10-
if(HAVE_UNICODE_LIBEDIT)
11-
target_link_libraries(swift-remoteast-test edit)
12-
endif()
10+
target_link_libraries(swift-remoteast-test edit)
1311

1412
# If building as part of clang, make sure the headers are installed.
1513
if(NOT SWIFT_BUILT_STANDALONE)

0 commit comments

Comments
 (0)