From 5a53ed4e314d60f7a1492cc327e80acffdfc39c5 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 18 Jul 2021 22:45:27 -0700 Subject: [PATCH] scons,test: Don't -Wall or -Werror for googletest libraries. These libraries come from elsewhere, and so there's no reason to worry about warnings. We can't fix them even if they crop up. Also, set CCFLAGS to avoid having a mixture of gem5 flags and googletest flags. Change-Id: I19b07747a43cebb263ae1546c75631cff1f13132 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48368 Maintainer: Gabe Black Maintainer: Bobby R. Bruce Tested-by: kokoro Reviewed-by: Bobby R. Bruce Reviewed-by: Daniel Carvalho --- ext/googletest/SConscript | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ext/googletest/SConscript b/ext/googletest/SConscript index e5241d66a0..5a4b691f0c 100644 --- a/ext/googletest/SConscript +++ b/ext/googletest/SConscript @@ -43,9 +43,8 @@ gmock_src = Dir('googlemock/src') main.Append(CPPPATH=[gtest_include, gmock_include]) main.Append(LIBPATH=[build]) -env = main.Clone(CPPFLAGS=['-g', '-Wall', '-Wextra', '-pthread', - '-Wno-undef', '-isystem', str(gtest_include), - '-isystem', str(gmock_include)]) +env = main.Clone(CCFLAGS=['-g', '-pthread', '-Wno-undef', '-isystem', + str(gtest_include), '-isystem', str(gmock_include)]) env.Append(CPPPATH=[gtest_base, gmock_base]) gtest_all = env.Object(gtest_src.File('gtest-all.cc'))