From f971dee540b9c9f7d6a92e278900e8bb00014f92 Mon Sep 17 00:00:00 2001
From: Mark Benvenuto <mark.benvenuto@mongodb.com>
Date: Tue, 16 Jan 2018 14:10:04 -0500
Subject: SERVER-32649 WiredTiger fails on non-x64 builds of new GCC

---
 src/third_party/wiredtiger/SConscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/third_party/wiredtiger/SConscript')

diff --git a/src/third_party/wiredtiger/SConscript b/src/third_party/wiredtiger/SConscript
index 1e07852979b..4e1335499fd 100644
--- a/src/third_party/wiredtiger/SConscript
+++ b/src/third_party/wiredtiger/SConscript
@@ -36,7 +36,8 @@ if conf.CheckFunc("sync_file_range"):
         "HAVE_SYNC_FILE_RANGE"
     ])
 
-if conf.CheckCHeader('x86intrin.h'):
+# GCC 8+ includes x86intrin.h in non-x64 versions of the compiler so limit the check to x64.
+if env['TARGET_ARCH'] == 'x86_64' and conf.CheckCHeader('x86intrin.h'):
     conf.env.Append(CPPDEFINES=[
         "HAVE_X86INTRIN_H"
     ])
-- 
cgit v1.2.1