Merge main to 6.2 - June24 (#8865)

Merge: 89bf98f 065df19

---------

Co-authored-by: Paulo Mattos <p_mattos@apple.com>
Co-authored-by: Bassam (Sam) Khouri <bkhouri@users.noreply.github.com>
Co-authored-by: Stuart Montgomery <smontgomery@apple.com>
Co-authored-by: Yuta Saito <kateinoigakukun@gmail.com>
Co-authored-by: nate-chandler <46721658+nate-chandler@users.noreply.github.com>
Co-authored-by: Max Desiatov <m_desiatov@apple.com>
Co-authored-by: 3405691582 <dsk@google.com>
Co-authored-by: Chris McGee <87777443+cmcgee1024@users.noreply.github.com>
Co-authored-by: Dave Inglis <dave.inglis@gmail.com>
Co-authored-by: Jonathan Grynspan <jgrynspan@apple.com>
Co-authored-by: Jake Petroules <jake.petroules@apple.com>
Co-authored-by: Shawn Hyam <shawn_hyam@apple.com>
Co-authored-by: Paul LeMarquand <plemarquand@apple.com>
Co-authored-by: Pavel Yaskevich <xedin@apache.org>
Co-authored-by: johnbute <john.bute@hotmail.com>
Co-authored-by: John Bute <johnbute@Johns-MacBook-Pro.local>
Co-authored-by: Joseph Heck <j_heck@apple.com>
Co-authored-by: kcieplak <kcieplak@apple.com>
Co-authored-by: Bri Peticca <briannap_22@apple.com>
Co-authored-by: Matt Seaman <mseaman@apple.com>
Co-authored-by: Yury Yurevich <yya@apple.com>
Co-authored-by: Anthony Latsis <aqamoss3fan2010@gmail.com>
Co-authored-by: Bri Peticca <bripeticca@gmail.com>
Co-authored-by: Louis Qian <qianyu021026@163.com>
Co-authored-by: Ben Barham <ben_barham@apple.com>
Co-authored-by: Rauhul Varma <rauhul@apple.com>
Co-authored-by: Pavel Yaskevich <pyaskevich@apple.com>
Co-authored-by: Owen Voorhees <ovoorhees@apple.com>
Co-authored-by: Sam Khouri <bkhouri@apple.com>
Co-authored-by: Franz Busch <f.busch@apple.com>
Co-authored-by: Robin Kunde <robin.kunde@recoursive.com>
Co-authored-by: Dave Inglis <dinglis@apple.com>
Co-authored-by: Anthony Latsis <alatsis@apple.com>
Co-authored-by: Doug Gregor <dgregor@apple.com>
Co-authored-by: Alexis Laferrière <alaf@apple.com>
Co-authored-by: Andrew Hoos <AndrewHoos@users.noreply.github.com>
Co-authored-by: Daniel Grumberg <dany.grumberg@gmail.com>
Co-authored-by: Artem Chikin <achikin@apple.com>
Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>
Co-authored-by: Dan Blackwell <dan_blackwell@apple.com>
Co-authored-by: Saleem Abdulrasool <abdulras@thebrowser.company>
Co-authored-by: Ole Begemann <ole@oleb.net>
Co-authored-by: Dmitrii Galimzianov <dmt021@gmail.com>

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)