aboutsummaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-12-23 00:09:23 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-12-23 00:09:23 +0000
commit7b0c8dd3a94fed17493e2f01dc2fa32bc1eb3a20 (patch)
tree1386fe7c08826bf9736000ac85184f9d32bf0270 /scons
parent940ce8a21024d9eb4221e5a9375615dbca926061 (diff)
downloadgoogletest-7b0c8dd3a94fed17493e2f01dc2fa32bc1eb3a20.tar.gz
googletest-7b0c8dd3a94fed17493e2f01dc2fa32bc1eb3a20.tar.bz2
googletest-7b0c8dd3a94fed17493e2f01dc2fa32bc1eb3a20.zip
Adds macro GTEST_DISALLOW_ASSIGN_, needed by gmock.
Diffstat (limited to 'scons')
-rw-r--r--scons/SConstruct.common2
1 files changed, 2 insertions, 0 deletions
diff --git a/scons/SConstruct.common b/scons/SConstruct.common
index cb9a63df..10947aea 100644
--- a/scons/SConstruct.common
+++ b/scons/SConstruct.common
@@ -87,6 +87,8 @@ class SConstructHelper:
# And another that definitely always points to the project root.
self.env_base['PROJECT_ROOT'] = self.env_base.Dir('.').abspath
+ self.env_base['OBJ_SUFFIX'] = '' # Default suffix for object files.
+
# Enable scons -h
Help(vars.GenerateHelpText(self.env_base))