Merge main to 6.2 - June24 (swiftlang#8865)

Merge: 89bf98f 065df19

---------

Co-authored-by: Paulo Mattos <[email protected]>
Co-authored-by: Bassam (Sam) Khouri <[email protected]>
Co-authored-by: Stuart Montgomery <[email protected]>
Co-authored-by: Yuta Saito <[email protected]>
Co-authored-by: nate-chandler <[email protected]>
Co-authored-by: Max Desiatov <[email protected]>
Co-authored-by: 3405691582 <[email protected]>
Co-authored-by: Chris McGee <[email protected]>
Co-authored-by: Dave Inglis <[email protected]>
Co-authored-by: Jonathan Grynspan <[email protected]>
Co-authored-by: Jake Petroules <[email protected]>
Co-authored-by: Shawn Hyam <[email protected]>
Co-authored-by: Paul LeMarquand <[email protected]>
Co-authored-by: Pavel Yaskevich <[email protected]>
Co-authored-by: johnbute <[email protected]>
Co-authored-by: John Bute <[email protected]>
Co-authored-by: Joseph Heck <[email protected]>
Co-authored-by: kcieplak <[email protected]>
Co-authored-by: Bri Peticca <[email protected]>
Co-authored-by: Matt Seaman <[email protected]>
Co-authored-by: Yury Yurevich <[email protected]>
Co-authored-by: Anthony Latsis <[email protected]>
Co-authored-by: Bri Peticca <[email protected]>
Co-authored-by: Louis Qian <[email protected]>
Co-authored-by: Ben Barham <[email protected]>
Co-authored-by: Rauhul Varma <[email protected]>
Co-authored-by: Pavel Yaskevich <[email protected]>
Co-authored-by: Owen Voorhees <[email protected]>
Co-authored-by: Sam Khouri <[email protected]>
Co-authored-by: Franz Busch <[email protected]>
Co-authored-by: Robin Kunde <[email protected]>
Co-authored-by: Dave Inglis <[email protected]>
Co-authored-by: Anthony Latsis <[email protected]>
Co-authored-by: Doug Gregor <[email protected]>
Co-authored-by: Alexis Laferrière <[email protected]>
Co-authored-by: Andrew Hoos <[email protected]>
Co-authored-by: Daniel Grumberg <[email protected]>
Co-authored-by: Artem Chikin <[email protected]>
Co-authored-by: Saleem Abdulrasool <[email protected]>
Co-authored-by: Dan Blackwell <[email protected]>
Co-authored-by: Saleem Abdulrasool <[email protected]>
Co-authored-by: Ole Begemann <[email protected]>
Co-authored-by: Dmitrii Galimzianov <[email protected]>

Author: 38 people

CMakeLists.txt

@@ -53,10 +53,9 @@ find_package(Foundation QUIET)
 find_package(SQLite3 REQUIRED)
 
 # Enable `package` modifier for the whole package.
+add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-package-name swift_package_manager>")
 if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>" -L/usr/local/lib)
-else()
-  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")
+  link_directories(/usr/local/lib)
 endif()
 
 add_subdirectory(BuildSupport/SwiftSyntax)