Skip to content

Commit

Permalink
Revert "Error out on invalid LLDB build configurations on OS X."
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Todd Fiala committed Dec 4, 2015
1 parent 048de03 commit 02a493b
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions utils/build-script
Original file line number Diff line number Diff line change
Expand Up @@ -604,27 +604,6 @@ placed""",
build_script_impl_inferred_args += [
"--skip-build-lldb"
]
else:
import platform
if platform.system() == "Darwin":
# Validate the LLDB build variant, exiting the
# build if it is not supported.
supported_variants = [
"Debug",
"Release"
]
if args.lldb_build_variant is not None:
lldb_build_variant = args.lldb_build_variant
else:
lldb_build_variant = args.build_variant
if lldb_build_variant not in supported_variants:
sys.stderr.write(
"The Swift LLDB build does not support build variant %s\n"
% lldb_build_variant)
sys.stderr.write(
"Please select one of the following variants: %s\n" %
", ".join(supported_variants))
sys.exit(1)

if not args.build_llbuild:
build_script_impl_inferred_args += [
Expand Down

3 comments on commit 02a493b

@jrose-apple
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. Is it possible to make the build-script-impl-only options go away in all the common cases? I'd rather keep all the logic up in build-script and leave build-script-impl as a low-level thing. (Which we eventually want to redo in Python, so that we're not crossing language boundaries for silly reasons.)

@tfiala
Copy link
Contributor

@tfiala tfiala commented on 02a493b Dec 4, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tfiala
Copy link
Contributor

@tfiala tfiala commented on 02a493b Dec 4, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.