@@ -221,7 +221,6 @@ def parse_global_args(args):
221221 args .build_dir = os .path .abspath (args .build_dir )
222222 args .project_root = os .path .dirname (os .path .dirname (os .path .abspath (__file__ )))
223223 args .source_dirs ["tsc" ] = os .path .join (args .project_root , ".." , "swift-tools-support-core" )
224- args .source_dirs ["yams" ] = os .path .join (args .project_root , ".." , "yams" )
225224 args .source_dirs ["swift-argument-parser" ] = os .path .join (args .project_root , ".." , "swift-argument-parser" )
226225 args .source_dirs ["swift-crypto" ] = os .path .join (args .project_root , ".." , "swift-crypto" )
227226 args .source_dirs ["swift-driver" ] = os .path .join (args .project_root , ".." , "swift-driver" )
@@ -372,19 +371,17 @@ def build(args):
372371
373372 # tsc depends on swift-system so they must be built first.
374373 build_dependency (args , "swift-system" )
375- # swift-driver depends on tsc, swift-argument-parser, and yams so they must be built first.
374+ # swift-driver depends on tsc and swift-argument-parser so they must be built first.
376375 tsc_cmake_flags = [
377376 "-DSwiftSystem_DIR=" + os .path .join (args .build_dirs ["swift-system" ], "cmake/modules" ),
378377 ]
379378 build_dependency (args , "tsc" , tsc_cmake_flags )
380379 build_dependency (args , "swift-argument-parser" , ["-DBUILD_TESTING=NO" , "-DBUILD_EXAMPLES=NO" ])
381- build_dependency (args , "yams" , [], [get_foundation_cmake_arg (args )] if args .foundation_build_dir else [])
382380
383381 swift_driver_cmake_flags = [
384382 get_llbuild_cmake_arg (args ),
385383 "-DSwiftSystem_DIR=" + os .path .join (args .build_dirs ["swift-system" ], "cmake/modules" ),
386384 "-DTSC_DIR=" + os .path .join (args .build_dirs ["tsc" ], "cmake/modules" ),
387- "-DYams_DIR=" + os .path .join (args .build_dirs ["yams" ], "cmake/modules" ),
388385 "-DArgumentParser_DIR=" + os .path .join (args .build_dirs ["swift-argument-parser" ], "cmake/modules" ),
389386 ]
390387 build_dependency (args , "swift-driver" , swift_driver_cmake_flags )
@@ -665,7 +662,6 @@ def build_swiftpm_with_cmake(args):
665662 add_rpath_for_cmake_build (args , args .build_dirs ["llbuild" ])
666663
667664 if platform .system () == "Darwin" :
668- add_rpath_for_cmake_build (args , os .path .join (args .build_dirs ["yams" ], "lib" ))
669665 add_rpath_for_cmake_build (args , os .path .join (args .build_dirs ["swift-argument-parser" ], "lib" ))
670666 add_rpath_for_cmake_build (args , os .path .join (args .build_dirs ["swift-crypto" ], "lib" ))
671667 add_rpath_for_cmake_build (args , os .path .join (args .build_dirs ["swift-driver" ], "lib" ))
@@ -796,7 +792,6 @@ def get_swiftpm_env_cmd(args):
796792 os .path .join (args .bootstrap_dir , "lib" ),
797793 os .path .join (args .build_dirs ["tsc" ], "lib" ),
798794 os .path .join (args .build_dirs ["llbuild" ], "lib" ),
799- os .path .join (args .build_dirs ["yams" ], "lib" ),
800795 os .path .join (args .build_dirs ["swift-argument-parser" ], "lib" ),
801796 os .path .join (args .build_dirs ["swift-crypto" ], "lib" ),
802797 os .path .join (args .build_dirs ["swift-driver" ], "lib" ),
0 commit comments