Skip to content

Add additional information #8291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Utilities/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ def get_swiftpm_flags(args):
build_flags.append("--disable-local-rpath")

if args.verbose:
build_flags.append("--verbose")
build_flags.append("--very-verbose")

if args.llbuild_link_framework:
build_flags.extend([
Expand Down
13 changes: 11 additions & 2 deletions Utilities/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,24 @@ def call(cmd, cwd=None, verbose=False):
subprocess.check_call(cmd, cwd=cwd)
except subprocess.CalledProcessError as cpe:
logging.debug("executing command >>> %s", ' '.join(cmd))
logging.error("Process failure: %s", str(cpe))
logging.error(
"Process failure: %s\n[---- START OUTPUT ----]\n%s\n[---- END OUTPUT ----]",
str(cpe),
cpe.output,
)
raise cpe

def call_output(cmd, cwd=None, stderr=False, verbose=False):
"""Calls a subprocess for its return data."""
stderr = subprocess.STDOUT if stderr else False
logging.info(' '.join(cmd))
try:
return subprocess.check_output(cmd, cwd=cwd, stderr=stderr, universal_newlines=True).strip()
except subprocess.CalledProcessError as cpe:
logging.debug(' '.join(cmd))
logging.error(str(cpe))
logging.error(
"%s\n[---- START OUTPUT ----]\n%s\n[---- END OUTPUT ----]",
str(cpe),
cpe.output,
)
raise cpe