Merge pull request #25991 from apple/revert-25275-editing-editing

Revert "build: improve libedit handling for builds"

Author: beccadax

CMakeLists.txt

@@ -915,11 +915,14 @@ else()
   find_package(LibXml2)
 endif()
 
-if(LLVM_ENABLE_LIBEDIT)
-  find_package(LibEdit REQUIRED)
-else()
-  find_package(LibEdit)
+# You need libedit linked in order to check if you have el_wgets.
+cmake_push_check_state()
+list(APPEND CMAKE_REQUIRED_LIBRARIES "edit")
+check_symbol_exists(el_wgets "histedit.h" HAVE_EL_WGETS)
+if(HAVE_EL_WGETS)
+  set(HAVE_UNICODE_LIBEDIT 1)
 endif()
+cmake_pop_check_state()
 
 check_symbol_exists(wait4 "sys/wait.h" HAVE_WAIT4)
 

cmake/modules/FindLibEdit.cmake

@@ -5,9 +5,6 @@ if(SWIFT_BUILD_REMOTE_MIRROR)
 endif()
 
 if(SWIFT_INCLUDE_TOOLS)
-  if(libedit_FOUND)
-    set(HAVE_UNICODE_LIBEDIT TRUE)
-  endif()
   configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h
                 ESCAPE_QUOTES @ONLY)
   add_subdirectory(Option)

include/swift/CMakeLists.txt

@@ -6,7 +6,7 @@ include_directories(
 
 add_swift_lib_subdirectory(sourcekitd)
 add_swift_tool_subdirectory(sourcekitd-test)
-if(libedit_FOUND)
+if(HAVE_UNICODE_LIBEDIT)
   add_swift_tool_subdirectory(sourcekitd-repl)
 endif()
 add_swift_tool_subdirectory(complete-test)

tools/SourceKit/tools/CMakeLists.txt

@@ -1,4 +1,7 @@
-if(libedit_FOUND)
+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} edit)
+check_symbol_exists(el_wgets "histedit.h" HAVE_UNICODE_LIBEDIT)
+
+if(HAVE_UNICODE_LIBEDIT)
   if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)
     set(SOURCEKITD_REPL_LINK_LIBS sourcekitdInProc)
   else()
@@ -7,13 +10,9 @@ if(libedit_FOUND)
 
   add_sourcekit_executable(sourcekitd-repl
     sourcekitd-repl.cpp
-    LINK_LIBS ${SOURCEKITD_REPL_LINK_LIBS}
+    LINK_LIBS ${SOURCEKITD_REPL_LINK_LIBS} edit
     LLVM_LINK_COMPONENTS support coverage lto
   )
-  target_include_directories(sourcekitd-repl PRIVATE
-    ${libedit_INCLUDE_DIRS})
-  target_link_libraries(sourcekitd-repl PRIVATE
-    ${libedit_LIBRARIES})
   if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
     target_link_libraries(sourcekitd-repl PRIVATE dispatch BlocksRuntime)
   endif()

tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

@@ -9,9 +9,8 @@ target_link_libraries(swift
                       PRIVATE
                         swiftDriver
                         swiftFrontendTool)
-if(libedit_FOUND)
-  target_link_libraries(swift PRIVATE
-    ${libedit_LIBRARIES})
+if(HAVE_UNICODE_LIBEDIT)
+  target_link_libraries(swift PRIVATE edit)
 endif()
 
 swift_create_post_build_symlink(swift

tools/driver/CMakeLists.txt

@@ -7,9 +7,8 @@ target_link_libraries(swift-remoteast-test
                         swiftFrontendTool
                         swiftRemoteAST)
 set_target_properties(swift-remoteast-test PROPERTIES ENABLE_EXPORTS 1)
-if(libedit_FOUND)
-  target_link_libraries(swift-remoteast-test PRIVATE
-    ${libedit_LIBRARIES})
+if(HAVE_UNICODE_LIBEDIT)
+  target_link_libraries(swift-remoteast-test PRIVATE edit)
 endif()
 
 # If building as part of clang, make sure the headers are installed.