From 4a20df608e35fdd328cf6e6253f7e7aa27edee10 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 15 Jul 2021 02:01:00 -0700 Subject: [PATCH] scons: Use a different suffix for test object files. These files are built with a different command line, and so should be distinct build artifacts in the build directory. Change-Id: Iec9403ad73fbdbcb1cd268d68716c3aa85a80b24 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48137 Tested-by: kokoro Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/SConscript | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SConscript b/src/SConscript index 4351f8a254..a92dd17b8f 100644 --- a/src/SConscript +++ b/src/SConscript @@ -556,6 +556,8 @@ class GTest(Executable): @classmethod def declare_all(cls, env): env = env.Clone() + env['OBJSUFFIX'] = 't' + env['OBJSUFFIX'] + env['SHOBJSUFFIX'] = 't' + env['SHOBJSUFFIX'] env.Append(LIBS=env['GTEST_LIBS']) env.Append(CPPFLAGS=env['GTEST_CPPFLAGS']) env['GTEST_LIB_SOURCES'] = Source.all.with_tag(env, 'gtest lib')