diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-11-19 18:23:43 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-11-19 18:23:43 -0500 |
| commit | fed9ee52fc551068b4b256f5e77b3bb924bbac05 (patch) | |
| tree | ed294cfca46049872e5a1ae2909219104b225556 | |
| parent | 785eb131907c4a3e326598643fc9b72b96911278 (diff) | |
| download | gem5-fed9ee52fc551068b4b256f5e77b3bb924bbac05.tar.xz | |
Compiling: Make sure that libelf is also compiled for 64bit on OS X.
--HG--
extra : convert_revision : 9d4f7064e0aa4b6cc6a5bcf0f6fb5289047cd143
| -rw-r--r-- | SConstruct | 1 | ||||
| -rw-r--r-- | ext/libelf/SConscript | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 38fbe8d4c..062df47d6 100644 --- a/SConstruct +++ b/SConstruct @@ -346,6 +346,7 @@ try: env.Append(CFLAGS='-arch x86_64') env.Append(LINKFLAGS='-arch x86_64') env.Append(ASFLAGS='-arch x86_64') + env['OSX64bit'] = True except: pass 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' |