Skip to content

Commit 6efa607

Browse files
committed
Add additional information
1 parent a86e9f9 commit 6efa607

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Utilities/bootstrap

+1-1
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ def get_swiftpm_flags(args):
832832
build_flags.append("--disable-local-rpath")
833833

834834
if args.verbose:
835-
build_flags.append("--verbose")
835+
build_flags.append("--very-verbose")
836836

837837
if args.llbuild_link_framework:
838838
build_flags.extend([

Utilities/helpers.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,15 @@ def call(cmd, cwd=None, verbose=False):
4747

4848
def call_output(cmd, cwd=None, stderr=False, verbose=False):
4949
"""Calls a subprocess for its return data."""
50+
stderr = subprocess.STDOUT if stderr else False
5051
logging.info(' '.join(cmd))
5152
try:
5253
return subprocess.check_output(cmd, cwd=cwd, stderr=stderr, universal_newlines=True).strip()
5354
except subprocess.CalledProcessError as cpe:
5455
logging.debug(' '.join(cmd))
55-
logging.error(str(cpe))
56+
logging.error("%s", str(cpe))
57+
for attr in ["output", 'stdout', 'stderr']:
58+
value = getattr(cpe, attr)
59+
attr_string = attr.upper()
60+
logging.error("[---- START %s ----]\n%s\n[---- END %s ----]", attr_string, value, attr_string)
5661
raise cpe

0 commit comments

Comments
 (0)