diff options
| author | Andrew Morrow <acm@mongodb.com> | 2021-11-25 14:28:19 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-16 17:08:01 +0000 |
| commit | 6b0aa52bef51b2a48909269f1b2e71015b3e83e7 (patch) | |
| tree | 463c9e5359c9a2f466b05d5a8ff55192aa1808a0 | |
| parent | 0507c5804f9402625654d054b9d7bd7eadabdb42 (diff) | |
| download | mongo-6b0aa52bef51b2a48909269f1b2e71015b3e83e7.tar.gz | |
SERVER-61743 Don't apply -fno-builtin-memcmp on non-x86 platforms
(cherry picked from commit bc6a66d1d4f2bf2dfe8603de792c567ee0db830c)
(cherry picked from commit e459b7ee056d5f634787d74718d6e23c6b1e6eb5)
(cherry picked from commit f4971c2c477491a354b32cea160a056628387a9b)
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 8eb9a18d035..5543d8f32fb 100644 --- a/SConstruct +++ b/SConstruct @@ -3226,9 +3226,10 @@ def doConfigure(myenv): myenv = conf.Finish() - # We set this to work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052 - if not myenv.ToolchainIs('msvc'): - AddToCCFLAGSIfSupported(myenv, "-fno-builtin-memcmp") + # We set this with GCC on x86 platforms to work around + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052 + if myenv.ToolchainIs('gcc') and (env['TARGET_ARCH'] in ['i386', 'x86_64']): + AddToCCFLAGSIfSupported(myenv, '-fno-builtin-memcmp') def CheckThreadLocal(context): test_body = """ |