From 6d2e71156c00482447f2f33f65de072477ef64bd Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 30 Apr 2018 17:42:38 +0100 Subject: [PATCH] scons: Fix --with-ubsan/asan compilation flags SConstruct was using an undefined env variable; this patch uses the main Environment variable. Change-Id: I30ab6b4bbfa6d9a71a30fb33406a799bfb476821 Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/10181 Reviewed-by: Gabe Black Maintainer: Gabe Black --- SConstruct | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 8fde13338..b382d3377 100755 --- a/SConstruct +++ b/SConstruct @@ -481,21 +481,21 @@ if main['GCC']: # The address sanitizer is available for gcc >= 4.8 if GetOption('with_asan'): if GetOption('with_ubsan') and \ - compareVersions(env['GCC_VERSION'], '4.9') >= 0: - env.Append(CCFLAGS=['-fsanitize=address,undefined', - '-fno-omit-frame-pointer'], + compareVersions(main['GCC_VERSION'], '4.9') >= 0: + main.Append(CCFLAGS=['-fsanitize=address,undefined', + '-fno-omit-frame-pointer'], LINKFLAGS='-fsanitize=address,undefined') else: - env.Append(CCFLAGS=['-fsanitize=address', - '-fno-omit-frame-pointer'], + main.Append(CCFLAGS=['-fsanitize=address', + '-fno-omit-frame-pointer'], LINKFLAGS='-fsanitize=address') # Only gcc >= 4.9 supports UBSan, so check both the version # and the command-line option before adding the compiler and # linker flags. elif GetOption('with_ubsan') and \ - compareVersions(env['GCC_VERSION'], '4.9') >= 0: - env.Append(CCFLAGS='-fsanitize=undefined') - env.Append(LINKFLAGS='-fsanitize=undefined') + compareVersions(main['GCC_VERSION'], '4.9') >= 0: + main.Append(CCFLAGS='-fsanitize=undefined') + main.Append(LINKFLAGS='-fsanitize=undefined') elif main['CLANG']: # Check for a supported version of clang, >= 3.1 is needed to -- 2.30.2