summaryrefslogtreecommitdiff
path: root/src/SConscript
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2019-11-18 17:41:49 -0800
committerGabe Black <gabeblack@google.com>2019-11-21 23:37:03 +0000
commit80283488ff763fbe1a6e82109ea74c7c5a898527 (patch)
treee99b4b55c58d9cd6b207040d77b2250df8228a15 /src/SConscript
parentcc3d5dfeb097d1d64fc39c7724de4b195eb957b7 (diff)
downloadgem5-80283488ff763fbe1a6e82109ea74c7c5a898527.tar.xz
scons: Use the new error() and warning() methods.
Also clean up some error messages which were missing capitalization, etc. Change-Id: Iaef6b4343a693d30b579e72218cbb7723ebf7d48 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22886 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Jason Lowe-Power <jason@lowepower.com> Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/SConscript')
-rw-r--r--src/SConscript8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/SConscript b/src/SConscript
index 53c012877..15b801a1b 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -54,7 +54,7 @@ from os.path import basename, dirname, exists, isdir, isfile, join as joinpath
import SCons
-from gem5_scons import Transform
+from gem5_scons import Transform, warning, error
# This file defines how to build a particular configuration of gem5
# based on variable settings in the 'env' build environment.
@@ -1020,8 +1020,7 @@ if env['HAVE_PROTOC'] and env['HAVE_PROTOBUF']:
# Add the C++ source file
Source(proto.cc_file, tags=proto.tags)
elif ProtoBuf.all:
- print('Got protobuf to build, but lacks support!')
- Exit(1)
+ error('Got protobuf to build, but lacks support!')
#
# Handle debug flags
@@ -1334,8 +1333,7 @@ elif env['CLANG']:
for target in ['opt', 'fast', 'prof', 'perf']:
ccflags[target] += ['-O3']
else:
- print('Unknown compiler, please fix compiler options')
- Exit(1)
+ error('Unknown compiler, please fix compiler options')
# To speed things up, we only instantiate the build environments we