Skip to content

Commit 02a493b

Browse files
author
Todd Fiala
committed
Revert "Error out on invalid LLDB build configurations on OS X."
This reverts commit b08610b. The check for LLDB build variant really needs to happen in build-script-impl. build-script can still take options after the '--' separator that may control the final determination of the LLDB build variant. These weren't all being considered by the logic in build-script.
1 parent 048de03 commit 02a493b

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

Diff for: utils/build-script

-21
Original file line numberDiff line numberDiff line change
@@ -604,27 +604,6 @@ placed""",
604604
build_script_impl_inferred_args += [
605605
"--skip-build-lldb"
606606
]
607-
else:
608-
import platform
609-
if platform.system() == "Darwin":
610-
# Validate the LLDB build variant, exiting the
611-
# build if it is not supported.
612-
supported_variants = [
613-
"Debug",
614-
"Release"
615-
]
616-
if args.lldb_build_variant is not None:
617-
lldb_build_variant = args.lldb_build_variant
618-
else:
619-
lldb_build_variant = args.build_variant
620-
if lldb_build_variant not in supported_variants:
621-
sys.stderr.write(
622-
"The Swift LLDB build does not support build variant %s\n"
623-
% lldb_build_variant)
624-
sys.stderr.write(
625-
"Please select one of the following variants: %s\n" %
626-
", ".join(supported_variants))
627-
sys.exit(1)
628607

629608
if not args.build_llbuild:
630609
build_script_impl_inferred_args += [

0 commit comments

Comments
 (0)