diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-05-31 18:21:17 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-05-31 18:21:17 -0400 |
| commit | 8ab0ffa3dd283b9f710246ba1e3b0c077bd64dc3 (patch) | |
| tree | b6705a0609fefa361b125732375cc5547bc7e828 | |
| parent | ace2890f9fd10fb8b19004b80befc1c9d0948246 (diff) | |
| parent | 1da901d60f10c6052f48b0e14e00e07a29cafcc0 (diff) | |
| download | gem5-8ab0ffa3dd283b9f710246ba1e3b0c077bd64dc3.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 5298568783db2238a90ce8aca8ad5ba57b7d4aab
| -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) |