diff options
| -rw-r--r-- | ext/libelf/SConscript | 6 | ||||
| -rwxr-xr-x | src/cpu/o3/SConscript | 2 | ||||
| -rw-r--r-- | src/cpu/ozone/SConscript | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index aebd0da85..d6f1e351b 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -92,11 +92,17 @@ if env.get('CC'): m4env['CC'] = env['CC'] if env.get('CXX'): m4env['CXX'] = env['CXX'] + # If we have gm4 use it if subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True).communicate()[0].find('GNU') >= 0: m4env['M4'] = 'gm4' +# Check that m4 is available +if not m4env.get('M4'): + print "Error: Can't find version of M4 macro processor. Please install M4 and try again." + Exit(1) + m4env.Append(M4FLAGS='-DSRCDIR=%s' % Dir('.').path) m4env['M4COM'] = '$M4 $M4FLAGS $SOURCES > $TARGET' m4env.M4(target=File('libelf_convert.c'), diff --git a/src/cpu/o3/SConscript b/src/cpu/o3/SConscript index a1af620be..ad61ad228 100755 --- a/src/cpu/o3/SConscript +++ b/src/cpu/o3/SConscript @@ -75,7 +75,7 @@ if 'O3CPU' in env['CPU_MODELS']: sys.exit('O3 CPU does not support the \'%s\' ISA' % env['TARGET_ISA']) if env['USE_CHECKER']: - SimObject('m5/objects/O3Checker.py') + SimObject('O3Checker.py') Source('checker_builder.cc') if 'O3CPU' in env['CPU_MODELS'] or 'OzoneCPU' in env['CPU_MODELS']: diff --git a/src/cpu/ozone/SConscript b/src/cpu/ozone/SConscript index 601e80a72..cb2006456 100644 --- a/src/cpu/ozone/SConscript +++ b/src/cpu/ozone/SConscript @@ -45,5 +45,5 @@ if 'OzoneCPU' in env['CPU_MODELS']: Source('lw_lsq.cc') Source('rename_table.cc') if env['USE_CHECKER']: - SimObject('m5/objects/OzoneChecker.py') + SimObject('OzoneChecker.py') Source('checker_builder.cc') |