Skip to content

Commit 30bf8f1

Browse files
committed
Add additional information
1 parent a86e9f9 commit 30bf8f1

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
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

+11-2
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,24 @@ def call(cmd, cwd=None, verbose=False):
4242
subprocess.check_call(cmd, cwd=cwd)
4343
except subprocess.CalledProcessError as cpe:
4444
logging.debug("executing command >>> %s", ' '.join(cmd))
45-
logging.error("Process failure: %s", str(cpe))
45+
logging.error(
46+
"Process failure: %s\n[---- START OUTPUT ----]\n%s\n[---- END OUTPUT ----]",
47+
str(cpe),
48+
cpe.output,
49+
)
4650
raise cpe
4751

4852
def call_output(cmd, cwd=None, stderr=False, verbose=False):
4953
"""Calls a subprocess for its return data."""
54+
stderr = subprocess.STDOUT if stderr else False
5055
logging.info(' '.join(cmd))
5156
try:
5257
return subprocess.check_output(cmd, cwd=cwd, stderr=stderr, universal_newlines=True).strip()
5358
except subprocess.CalledProcessError as cpe:
5459
logging.debug(' '.join(cmd))
55-
logging.error(str(cpe))
60+
logging.error(
61+
"%s\n[---- START OUTPUT ----]\n%s\n[---- END OUTPUT ----]",
62+
str(cpe),
63+
cpe.output,
64+
)
5665
raise cpe

0 commit comments

Comments
 (0)