summaryrefslogtreecommitdiff
path: root/ext/libelf
diff options
context:
space:
mode:
Diffstat (limited to 'ext/libelf')
-rw-r--r--ext/libelf/SConscript8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index 5e92fe08b..56983d12f 100644
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -32,6 +32,8 @@ import os, subprocess
Import('main')
+from m5.util import compareVersions
+
elf_files = []
def ElfFile(filename):
elf_files.append(File(filename))
@@ -91,9 +93,11 @@ ElfFile('libelf_msize.c')
m4env = main.Clone()
if m4env['GCC']:
- major,minor,dot = [int(x) for x in m4env['GCC_VERSION'].split('.')]
- if major >= 4:
+ if compareVersions(m4env['GCC_VERSION'], '4') >= 0:
m4env.Append(CCFLAGS=['-Wno-pointer-sign'])
+ if compareVersions(m4env['GCC_VERSION'], '4.6') >= 0:
+ m4env.Append(CCFLAGS=['-Wno-unused-but-set-variable',
+ '-Wno-implicit-function-declaration'])
if m4env['CLANG']:
m4env.Append(CCFLAGS=['-Wno-initializer-overrides', '-Wno-pointer-sign'])
m4env.Append(CCFLAGS=['-Wno-implicit'])