summaryrefslogtreecommitdiff
path: root/ext/libelf/SConscript
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-11-20 15:38:54 -0800
committerGabe Black <gblack@eecs.umich.edu>2007-11-20 15:38:54 -0800
commite35c4f2f089ad25cf3081cea50b018717dd0b192 (patch)
tree48d39aff50851566811f1a2925eb59228e1f6af1 /ext/libelf/SConscript
parenta12d5975cc8ea9462c731f58c0a950a8d3e44409 (diff)
parent088d7c70968a6ba43eddb4116c35a707747b7216 (diff)
downloadgem5-e35c4f2f089ad25cf3081cea50b018717dd0b192.tar.xz
Merge with head.
--HG-- extra : convert_revision : c4215e516c6d82ad466db898ffeefa0233ca110e
Diffstat (limited to 'ext/libelf/SConscript')
-rw-r--r--ext/libelf/SConscript5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index 99c5a4f99..3d35b0c07 100644
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -88,11 +88,16 @@ ElfFile('libelf_fsize.c')
ElfFile('libelf_msize.c')
m4env = Environment(ENV=os.environ)
+
if env.get('CC'):
m4env['CC'] = env['CC']
if env.get('CXX'):
m4env['CXX'] = env['CXX']
+if env.get('OSX64bit'):
+ m4env.Append(CFLAGS='-arch x86_64')
+ m4env.Append(LINKFLAGS='-arch x86_64')
+
# If we have gm4 use it
if m4env.Detect('gm4'):
m4env['M4'] = 'gm4'