diff options
| author | Andrew Morrow <acm@mongodb.com> | 2014-12-16 16:19:29 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2014-12-17 10:51:23 -0500 |
| commit | f8331e15dfefff9bd4cfd23f197dcb535d0a2ea3 (patch) | |
| tree | 358e84dd28366a531c9973ef355c76d876fde58d | |
| parent | 26d1d8d654693540f690a70077e0f0141e1e4cce (diff) | |
| download | mongo-f8331e15dfefff9bd4cfd23f197dcb535d0a2ea3.tar.gz | |
SERVER-15357 Revert "Revert "SERVER-15357 Require GCC 4.8.2 now that our Solaris toolchain is updated""
This reverts commit b5d97eeeea4ef66731eb273bc484884452991acf.
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index acc8ba859be..0edc927f11b 100644 --- a/SConstruct +++ b/SConstruct @@ -1127,17 +1127,14 @@ def doConfigure(myenv): } """ % compiler_minimum_string) elif using_gcc(): - # TODO: Really, we want GCC 4.8.2 here, but we are admitting 4.8.1 - # until our Solaris toolchain solution reaches 4.8.2. When our Solaris - # toolchain reaches 4.8.2, upgrade this string, and the check below. - compiler_minimum_string = "GCC 4.8.1" + compiler_minimum_string = "GCC 4.8.2" compiler_test_body = textwrap.dedent( """ #if !defined(__GNUC__) || defined(__clang__) #error #endif - #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1) + #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 2) #error %s or newer is required to build MongoDB #endif |