Merge pull request #2739 from owenv/driver-add-argparse

DougGregor · web-flow · commit d1c1c3ae42e1 · 2020-09-09T12:57:04.000-07:00
[bootstrap] Add swift-argument-parser as a bootstrapped swift-driver dependency
diff --git a/Utilities/bootstrap b/Utilities/bootstrap
@@ -523,6 +523,7 @@ def build_swift_driver(args):
         get_llbuild_cmake_arg(args),
         "-DTSC_DIR=" + os.path.join(args.tsc_build_dir, "cmake/modules"),
         "-DYams_DIR=" + os.path.join(args.yams_build_dir, "cmake/modules"),
+        "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"),
     ]
     if platform.system() == 'Darwin':
         cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target))

Original file line number	Diff line number	Diff line change
`@@ -523,6 +523,7 @@ def build_swift_driver(args):`
`523`	`523`	`get_llbuild_cmake_arg(args),`
`524`	`524`	`"-DTSC_DIR=" + os.path.join(args.tsc_build_dir, "cmake/modules"),`
`525`	`525`	`"-DYams_DIR=" + os.path.join(args.yams_build_dir, "cmake/modules"),`
	`526`	`+ "-DArgumentParser_DIR=" + os.path.join(args.swift_argument_parser_build_dir, "cmake/modules"),`
`526`	`527`	`]`
`527`	`528`	`if platform.system() == 'Darwin':`
`528`	`529`	`cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target))`