[CMake Build] Build and link driver dependencies as static libraries

This will allow us to not install shared libraries of TSC, ArgumentParser, etc. into the toolchain when installing the driver.

Author: artemcm

CMakeLists.txt

@@ -60,6 +60,7 @@ endif()
 
 find_package(dispatch QUIET)
 find_package(Foundation QUIET)
+find_package(Threads QUIET)
 find_package(Yams CONFIG REQUIRED)
 find_package(ArgumentParser CONFIG REQUIRED)
 find_package(SwiftSystem CONFIG REQUIRED)

Utilities/build-script-helper.py

@@ -307,47 +307,16 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir, tar
                                          args.configuration, 'lib')
       delete_rpath(driver_lib_dir_path, lib_path, args.verbose)
 
-  # Fixup the TSC and llbuild rpaths
-  driver_libs = map(lambda d: os.path.join('lib', d), ['libSwiftDriver', 'libSwiftOptions', 'libSwiftDriverExecution'])
-  tsc_libs = map(lambda d: os.path.join('dependencies', 'swift-tools-support-core', 'lib', d),
-                 ['libTSCBasic', 'libTSCLibc', 'libTSCUtility'])
-  for lib in driver_libs + tsc_libs:
-    for target in targets:
-      lib_path = os.path.join(build_dir, target,
-                              args.configuration, lib + shared_lib_ext)
-      for dep in ['swift-tools-support-core', 'llbuild']:
-        lib_dir_path = os.path.join(build_dir, target,
-                                        args.configuration, 'dependencies',
-                                        dep, 'lib')
-        delete_rpath(lib_dir_path, lib_path, args.verbose)
-
   # Install the libSwiftDriver and libSwiftOptions and libSwiftDriverExecution
   # shared libraries into the toolchain lib
   package_subpath = args.configuration
   for lib in ['libSwiftDriver', 'libSwiftOptions', 'libSwiftDriverExecution']:
     install_library(args, build_dir, package_subpath, lib,
                     universal_lib_dir, toolchain_lib_dir, 'swift-driver', targets)
 
-  # Install the swift-tools-support core shared libraries into the toolchain lib
-  package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-tools-support-core')
-  for lib in ['libTSCBasic', 'libTSCLibc', 'libTSCUtility']:
-    install_library(args, build_dir, package_subpath, lib,
-                    universal_lib_dir, toolchain_lib_dir, 'swift-tools-support-core', targets)
-
-  # Install the swift-system shared library into the toolchain lib
-  package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-system')
-  install_library(args, build_dir, package_subpath, 'libSystemPackage',
-                  universal_lib_dir, toolchain_lib_dir, 'swift-system', targets)
-
-  # Install the swift-argument-parser shared libraries into the toolchain lib
-  package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-argument-parser')
-  for lib in ['libArgumentParser', 'libArgumentParserToolInfo']:
-      install_library(args, build_dir, package_subpath, lib,
-                      universal_lib_dir, toolchain_lib_dir,'swift-argument-parser', targets)
-
   # Install the llbuild core shared libraries into the toolchain lib
   package_subpath = os.path.join(args.configuration, 'dependencies', 'llbuild')
-  for lib in ['libllbuildSwift', 'libllbuild']:
+  for lib in ['libllbuild']:
     install_library(args, build_dir, package_subpath, lib,
                     universal_lib_dir, toolchain_lib_dir,'llbuild', targets)
 
@@ -475,7 +444,8 @@ def build_llbuild_using_cmake(args, target, swiftc_exec, build_dir, base_cmake_f
         '-DCMAKE_C_COMPILER:=clang',
         '-DCMAKE_CXX_COMPILER:=clang++',
         '-DCMAKE_CXX_FLAGS=-target %s' % target,
-        '-DLLBUILD_SUPPORT_BINDINGS:=Swift'
+        '-DLLBUILD_SUPPORT_BINDINGS:=Swift',
+        '-DBUILD_SHARED_LIBS=OFF'
     ]
   if platform.system() == 'Darwin':
     flags.append('-DCMAKE_OSX_ARCHITECTURES=%s' % target.split('-')[0])
@@ -496,9 +466,7 @@ def build_system_using_cmake(args, target, swiftc_exec, build_dir, base_cmake_fl
   print('Building Swift Driver dependency: Swift System')
   system_source_dir = os.path.join(os.path.dirname(args.package_path), 'swift-system')
   system_build_dir = os.path.join(build_dir, 'swift-system')
-  flags = [
-      # requried due to swift-autolink-extract bug ("The file was not recognized as a valid object file")
-      "-DBUILD_SHARED_LIBS=YES"]
+  flags = ['-DBUILD_SHARED_LIBS=OFF']
   system_cmake_flags = base_cmake_flags + flags
   system_swift_flags = swift_flags[:]
   cmake_build(args, swiftc_exec, system_cmake_flags, system_swift_flags,
@@ -509,7 +477,8 @@ def build_tsc_using_cmake(args, target, swiftc_exec, build_dir, base_cmake_flags
   tsc_source_dir = os.path.join(os.path.dirname(args.package_path), 'swift-tools-support-core')
   tsc_build_dir = os.path.join(build_dir, 'swift-tools-support-core')
   flags = [
-      '-DSwiftSystem_DIR=' + os.path.join(os.path.join(build_dir, 'swift-system'), 'cmake/modules')]
+      '-DSwiftSystem_DIR=' + os.path.join(os.path.join(build_dir, 'swift-system'), 'cmake/modules'),
+      '-DBUILD_SHARED_LIBS=OFF']
   tsc_cmake_flags = base_cmake_flags + flags
 
   tsc_swift_flags = swift_flags[:]
@@ -539,7 +508,8 @@ def build_argument_parser_using_cmake(args, target, swiftc_exec, build_dir, base
   print('Building Swift Driver dependency: Argument Parser')
   parser_source_dir = os.path.join(os.path.dirname(args.package_path), 'swift-argument-parser')
   parser_build_dir = os.path.join(build_dir, 'swift-argument-parser')
-  custom_flags = ['-DBUILD_TESTING=NO', '-DBUILD_EXAMPLES=NO']
+  custom_flags = ['-DBUILD_TESTING=NO', '-DBUILD_EXAMPLES=NO',
+                  '-DBUILD_SHARED_LIBS=OFF']
   parser_cmake_flags = base_cmake_flags + custom_flags
   parser_swift_flags = swift_flags[:]
   cmake_build(args, swiftc_exec, parser_cmake_flags, parser_swift_flags,
@@ -558,7 +528,8 @@ def build_swift_driver_using_cmake(args, target, swiftc_exec, build_dir, base_cm
         '-DTSC_DIR=' + os.path.join(os.path.join(dependencies_dir, 'swift-tools-support-core'), 'cmake/modules'),
         '-DYams_DIR=' + os.path.join(os.path.join(dependencies_dir, 'yams'), 'cmake/modules'),
         '-DArgumentParser_DIR=' + os.path.join(os.path.join(dependencies_dir, 'swift-argument-parser'), 'cmake/modules'),
-        '-DSwiftSystem_DIR=' + os.path.join(os.path.join(dependencies_dir, 'swift-system'), 'cmake/modules')]
+        '-DSwiftSystem_DIR=' + os.path.join(os.path.join(dependencies_dir, 'swift-system'), 'cmake/modules'),
+        '-DBUILD_SHARED_LIBS=OFF']
   driver_cmake_flags = base_cmake_flags + flags
   cmake_build(args, swiftc_exec, driver_cmake_flags, driver_swift_flags,
               driver_source_dir, driver_build_dir)