[Build] Further static Linux SDK support changes.

al45tair · al45tair · commit 3627507eb187 · 2024-05-03T09:12:49.000+01:00
Fix some indentation issues.

Change `build-script-impl` to make `build-linux-static` a positive argument.

Fix documentation for `--linux-archs` and `--linux-static-archs` (the options
are comma separated for `build-script`, but semicolon separated for
`build-script-impl`).

Set the default for `linux-static-archs` to `x86_64, aarch64` so that we
install the expected content in the toolchain.

Add missing default for `test_linux_static`.

Make sure to pass down `--skip-build-linux` and `--build-linux-static`.

Factor out config file generation and call it from the install step in `llvm.py`
as well as from the build step.

rdar://123503470
diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake
@@ -2432,9 +2432,9 @@ function(add_swift_target_library name)
         if (SWIFTLIB_IS_STDLIB AND SWIFTLIB_STATIC)
           # Add dependencies on the (not-yet-created) custom lipo target.
           foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
-          if (NOT "${DEP}" MATCHES "^icucore($|-.*)$" AND
-              NOT "${DEP}" MATCHES "^dispatch($|-.*)$" AND
-              NOT "${DEP}" MATCHES "^BlocksRuntime($|-.*)$")
+            if (NOT "${DEP}" MATCHES "^icucore($|-.*)$" AND
+                NOT "${DEP}" MATCHES "^dispatch($|-.*)$" AND
+                NOT "${DEP}" MATCHES "^BlocksRuntime($|-.*)$")
               add_dependencies("${VARIANT_NAME}-static"
                 "${DEP}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}-static")
             endif()
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -97,6 +97,7 @@ KNOWN_SETTINGS=(
     musl-path                                     "/usr/local/musl" "The path to the Musl headers and libraries"
     linux-archs                                   ""                "The Linux target architecture(s)"
     linux-static-archs                            ""                "The fully static Linux target architecture(s)"
+    build-linux-static                            ""                "set to build Swift stdlibs for statically linked Linux"
 
     ## Darwin Options
     darwin-crash-reporter-client                  ""                "whether to enable CrashReporter integration, default is 1 on Darwin platforms, 0 otherwise"
@@ -136,7 +137,6 @@ KNOWN_SETTINGS=(
     skip-build                                    ""                "set to configure as usual while skipping the build step"
     skip-build-android                            ""                "set to skip building Swift stdlibs for Android"
     skip-build-linux                              ""                "set to skip building Swift stdlibs for Linux"
-    skip-build-linux-static                       ""                "set to skip building Swift stdlibs for statically linked Linux"
     skip-build-wasm                               ""                "set to skip building Swift stdlibs for WebAssembly"
     skip-build-benchmarks                         ""                "set to skip building Swift Benchmark Suite"
     skip-build-clang-tools-extra                  ""                "set to skip building clang-tools-extra as part of llvm"
@@ -1733,7 +1733,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     )
                 fi
 
-                if [[ ! "${SKIP_BUILD_LINUX_STATIC}" ]]; then
+                if [[ "${BUILD_LINUX_STATIC}" ]]; then
                     cmake_options=(
                         "${cmake_options[@]}"
                         -DSWIFT_MUSL_PATH:STRING="${MUSL_PATH}"
diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py
@@ -1397,7 +1397,7 @@ def create_argument_parser():
     option('--linux-archs', store,
            type=argparse.ShellSplitType(),
            default=None,
-           help='Semicolon-separated list of architectures to use when '
+           help='Comma-separated list of architectures to use when '
            'building for Linux.')
 
     # -------------------------------------------------------------------------
@@ -1409,8 +1409,8 @@ def create_argument_parser():
 
     option('--linux-static-archs', store,
            type=argparse.ShellSplitType(),
-           default=None,
-           help='Semicolon-separated list of architectures to use when '
+           default=['x86_64', 'aarch64'],
+           help='Comma-separated list of architectures to use when '
            'building for fully static Linux.')
 
     # -------------------------------------------------------------------------
diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py
@@ -238,7 +238,7 @@
     'maccatalyst': False,
     'maccatalyst_ios_tests': False,
     'musl_path': '/usr/local/musl',
-    'linux_static_archs': None,
+    'linux_static_archs': ['x86_64', 'aarch64'],
     'native_clang_tools_path': None,
     'native_llvm_tools_path': None,
     'native_swift_tools_path': None,
@@ -285,6 +285,7 @@
     'test_ios_host': False,
     'test_ios_simulator': False,
     'test_linux': False,
+    'test_linux_static': False,
     'test_optimize_for_size': None,
     'test_optimize_none_with_implicit_dynamic': None,
     'test_optimized': None,
diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py
@@ -533,6 +533,11 @@ def convert_to_impl_arguments(self):
                 "--linux-archs=%s" % ';'.join(args.linux_archs)
             ]
 
+        if not args.build_linux:
+            impl_args += ["--skip-build-linux"]
+        if args.build_linux_static:
+            impl_args += ["--build-linux-static"]
+
         # Compute the set of host-specific variables, which we pass through to
         # the build script via environment variables.
         host_specific_variables = self.compute_host_specific_variables()
diff --git a/utils/swift_build_support/swift_build_support/products/llvm.py b/utils/swift_build_support/swift_build_support/products/llvm.py
@@ -199,6 +199,35 @@ def copy_embedded_compiler_rt_builtins_from_darwin_host_toolchain(
                         elif self.args.verbose_build:
                             print('no file exists at {}'.format(host_lib_path))
 
+    def install_static_linux_config(self, arch, bin_dir):
+        """Install the .cfg files to set the relevant Clang options for the
+        fully static Linux SDK's <arch>-swift-linux-musl triple.
+
+        Doing it this way means it's easier to modify the defaults without
+        having to change the compiler driver."""
+
+        try:
+            os.makedirs(bin_dir)
+        except FileExistsError:
+            pass
+
+        musl_cfg = os.path.join(bin_dir, f'{arch}-swift-linux-musl-clang.cfg')
+        with open(musl_cfg, "wt") as f:
+            f.write(f"""
+-target {arch}-swift-linux-musl
+-rtlib=compiler-rt
+-stdlib=libc++
+-fuse-ld=lld
+-unwindlib=libunwind
+-lc++abi
+-static
+            """)
+        for name in (f'{arch}-swift-linux-musl-clang++.cfg', ):
+            try:
+                os.symlink(musl_cfg, os.path.join(bin_dir, name))
+            except FileExistsError:
+                pass
+
     def should_build(self, host_target):
         """should_build() -> Bool
 
@@ -354,28 +383,7 @@ def build(self, host_target):
 
         # Install config files for linux-static
         bin_dir = os.path.join(host_build_dir, 'bin')
-        try:
-            os.makedirs(bin_dir)
-        except FileExistsError:
-            pass
-
-        musl_cfg = os.path.join(bin_dir, f'{arch}-swift-linux-musl-clang.cfg')
-        with open(musl_cfg, "wt") as f:
-            f.write(f"""
--target {arch}-swift-linux-musl
--rtlib=compiler-rt
--stdlib=libc++
--fuse-ld=lld
--unwindlib=libunwind
--lc++abi
--funwind-tables
--fasynchronous-unwind-tables
-            """)
-        for name in (f'{arch}-swift-linux-musl-clang++.cfg', ):
-            try:
-                os.symlink(musl_cfg, os.path.join(host_build_dir, 'bin', name))
-            except FileExistsError:
-                pass
+        self.install_static_linux_config(arch, bin_dir)
 
         if self.is_cross_compile_target(host_target):
             build_root = os.path.dirname(self.build_dir)
@@ -511,8 +519,13 @@ def install(self, host_target):
 
         self.install_with_cmake(install_targets, host_install_destdir)
 
+        clang_dest_dir = '{}{}'.format(host_install_destdir,
+                                       self.args.install_prefix)
+
+        bin_dir = os.path.join(clang_dest_dir, 'bin')
+        for arch in self.args.linux_static_archs:
+            self.install_static_linux_config(arch, bin_dir)
+
         if self.args.llvm_install_components and system() == 'Darwin':
-            clang_dest_dir = '{}{}'.format(host_install_destdir,
-                                           self.args.install_prefix)
             self.copy_embedded_compiler_rt_builtins_from_darwin_host_toolchain(
                 clang_dest_dir)
