diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-05-31 22:21:18 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-05-31 22:21:18 +0000 |
| commit | fbcc35450db7f70889b9769b3f4e704413e52f1c (patch) | |
| tree | e3bb7947362a97f00403f334ad6c20cb320f9292 | |
| parent | d24a9c7d21702a7eb16a06af6508bf922ca11d6a (diff) | |
| parent | 8ab0ffa3dd283b9f710246ba1e3b0c077bd64dc3 (diff) | |
| download | gem5-fbcc35450db7f70889b9769b3f4e704413e52f1c.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
--HG--
extra : convert_revision : c99372d62e4e6acdced977da8480f2379b6f00a1
| -rw-r--r-- | ext/libelf/SConscript | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript index 7affa6dcb..31e570396 100644 --- a/ext/libelf/SConscript +++ b/ext/libelf/SConscript @@ -94,13 +94,12 @@ if env.get('CXX'): m4env['CXX'] = env['CXX'] # If we have gm4 use it -subp = subprocess.Popen("gm4 --version", shell=True, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, close_fds=True) -if subp.communicate()[0].find('GNU') >= 0: +if m4env.Detect('gm4'): m4env['M4'] = 'gm4' # Check that m4 is available -if not m4env.get('M4'): +import SCons.Tool.m4 +if not SCons.Tool.m4.exists(m4env): print "Error: Can't find version of M4 macro processor. " + \ "Please install M4 and try again." Exit(1) |