Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/16567
Change subject: ext: test: Split up the GTEST_CPPFLAGS and CPPFLAGS.
......................................................................
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
---
M ext/googletest/SConscript
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ext/googletest/SConscript b/ext/googletest/SConscript
index 6792a75..e5241d6 100644
--- a/ext/googletest/SConscript
+++ b/ext/googletest/SConscript
@@ -43,14 +43,16 @@
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]
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/16567
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ib7688a7abced43a9c62994d17b78d358fc0dc000
Gerrit-Change-Number: 16567
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
