summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-07-16 10:19:07 -0400
committerAndrew Morrow <acm@mongodb.com>2015-07-16 12:26:55 -0400
commitc3bb28439aeb6d780b1b74cd8954ba6d914739b2 (patch)
tree5556cfbfd2439a8fb70ecd49b434fd845f010a3f
parent74fd5c88eaf762152ed2dd8a54b7809fe9d2b8e4 (diff)
downloadmongo-c3bb28439aeb6d780b1b74cd8954ba6d914739b2.tar.gz
SERVER-19427 Fix malformed one element tuples in processor_macros dictionary
-rw-r--r--SConstruct7
1 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct
index c25ad2ce68b..03990e4f10e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -857,12 +857,15 @@ def CheckForToolchain(context, toolchain, lang_name, compiler_var, source_suffix
# These preprocessor macros came from
# http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros
+#
+# NOTE: Remember to add a trailing comma to form any required one
+# element tuples, or your configure checks will fail in strange ways.
processor_macros = {
'x86_64': ('__x86_64', '_M_AMD64'),
'i386': ('__i386', '_M_IX86'),
- 'sparc': ('__sparc'),
+ 'sparc': ('__sparc',),
'PowerPC': ('__powerpc__', '__PPC'),
- 'arm' : ('__arm__'),
+ 'arm' : ('__arm__',),
'arm64' : ('__arm64__', '__aarch64__'),
}