ext: test: Split up the GTEST_CPPFLAGS and CPPFLAGS.

scons seems to get confused in some situations when this is a single
large string and passes it as one big argument to g++ instead of
breaking it up into several arguments.

We need to do the work for it and break it into individual arguments,
like what was already being done with GTEST_LIBS.

Also wrap some overly long lines.

Change-Id: Ib7688a7abced43a9c62994d17b78d358fc0dc000
Reviewed-on: https://gem5-review.googlesource.com/c/16567
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>

diff --git a/ext/googletest/SConscript b/ext/googletest/SConscript
index 6792a756c815d83a92662596bf355cdd52a547a1..e5241d66a01a5288e03e4bb96ee3d2bd63c1ac1a 100644 (file)
--- a/ext/googletest/SConscript
+++ b/ext/googletest/SConscript
@@ -43,14 +43,16 @@ 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 %s -isystem %s' % (gtest_include, gmock_include))
+env = main.Clone(CPPFLAGS=['-g', '-Wall', '-Wextra', '-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'))
 gmock_all = env.Object(gmock_src.File('gmock-all.cc'))
-gtest_main = env.StaticLibrary(
-    target='libgtest', source=[gtest_all, gmock_all, gtest_src.File('gtest_main.cc')])
+gtest_main = env.StaticLibrary(target='libgtest', source=[
+        gtest_all, gmock_all, gtest_src.File('gtest_main.cc')])
 
 main['GTEST_LIBS'] = ['libgtest', 'pthread']
-main['GTEST_CPPFLAGS'] = '-pthread -DUSE_GMOCK -Wno-undef -isystem %s' % gtest_include.abspath
+main['GTEST_CPPFLAGS'] = [
+    '-pthread', '-DUSE_GMOCK', '-Wno-undef', '-isystem', gtest_include.abspath]