Merge pull request #25114 from akyrtzi/build-parserlib-link-fix

Author: swift-ci

lib/Basic/CMakeLists.txt

@@ -109,11 +109,9 @@ add_swift_host_library(swiftBasic STATIC
 target_include_directories(swiftBasic PRIVATE
   ${UUID_INCLUDE})
 
-if(NOT SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
-  target_link_libraries(swiftBasic PRIVATE
-    swiftDemangling
-    ${UUID_LIBRARIES})
-endif()
+target_link_libraries(swiftBasic PRIVATE
+  swiftDemangling
+  ${UUID_LIBRARIES})
 
 message(STATUS "Swift version: ${SWIFT_VERSION}")
 message(STATUS "Swift vendor: ${SWIFT_VENDOR}")

utils/build-parser-lib

@@ -234,7 +234,7 @@ def main():
     option('--install-symroot', store_path,
            help='the path to install debug symbols into')
     option('--install-destdir', store_path,
-           help='the path to use as the filesystem root for the installation')
+           help='the path to use as the filesystem root for the installation (default = \'$(build_dir)/install\')')
     option('--install-prefix', store,
            default = default_install_prefix,
            help='the install prefix to use (default = %s)' % default_install_prefix)
@@ -247,6 +247,9 @@ def main():
     parser = optbuilder.build()
     args = parser.parse_args()
 
+    if not args.install_destdir:
+        args.install_destdir = os.path.join(args.build_dir, 'install')
+
     if isDarwin:
         architectures = args.architectures.split(" ")
         architectures = [arch for arch in architectures if arch != platform.machine() and arch != ""]