presets: Update swift macos/linux preset

Create a common SwiftPM build preset configuration, and use this preset
in the Swift PM macos and linux presets to ensure the swift presets
builds the SwiftPM dependencies.  In addition, include this preset in
the Swift MacOS/Linux smoke test preset.

Author: bkhouri

utils/build-presets.ini

@@ -21,6 +21,26 @@ swift-install-components=back-deployment;compiler;clang-builtin-headers;libexec;
 swift-install-components=autolink-driver;back-deployment;compiler;clang-resource-dir-symlink;libexec;stdlib;sdk-overlay;static-mirror-lib;toolchain-tools;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers
 llvm-install-components=llvm-ar;llvm-ranlib;llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;libclang;dsymutil;LTO;clang-features-file;lld
 
+[preset: mixin_swiftpm_build_base]
+mixin-preset=
+    buildbot_incremental_base
+    mixin_buildbot_install_components_with_clang
+
+libcxx
+llbuild
+swiftpm
+
+install-llvm
+install-static-linux-config
+install-swift
+install-llbuild
+install-swiftpm
+install-swiftsyntax
+swift-testing
+swift-testing-macros
+install-swift-testing
+install-swift-testing-macros
+
 [preset: mixin_buildbot_trunk_base]
 # Build standard library and SDK overlay for iOS device and simulator.
 ios
@@ -609,6 +629,7 @@ mixin-preset=
     buildbot_incremental_base
     lldb-smoketest,tools=RA
     mixin_buildbot_install_components_with_clang
+    mixin_swiftpm_build_base
 build-subdir=buildbot_incremental
 
 # We build release+asserts.
@@ -1077,6 +1098,7 @@ mixin-preset=
 mixin-preset=
     mixin_lightweight_assertions,no-stdlib-asserts
     mixin_linux_installation
+    mixin_swiftpm_build_base
 build-subdir=buildbot_linux
 lldb
 release
@@ -1830,26 +1852,9 @@ skip-test-foundation
 #===------------------------------------------------------------------------===#
 # Base of SwiftPM and packages
 [preset: mixin_swiftpm_base]
-mixin-preset=
-    buildbot_incremental_base
-    mixin_buildbot_install_components_with_clang
+mixin-preset=mixin_swiftpm_build_base
 build-subdir=buildbot_incremental
 
-libcxx
-llbuild
-swiftpm
-
-install-llvm
-install-static-linux-config
-install-swift
-install-llbuild
-install-swiftpm
-install-swiftsyntax
-swift-testing
-swift-testing-macros
-install-swift-testing
-install-swift-testing-macros
-
 skip-test-swift
 
 # SwiftPM base