diff options
| author | Andrew Morrow <acm@mongodb.com> | 2014-12-05 17:18:21 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2014-12-05 17:18:21 -0500 |
| commit | b5d97eeeea4ef66731eb273bc484884452991acf (patch) | |
| tree | 945b036c356e89569088959a7e919f1f562bcc12 /SConstruct | |
| parent | 0a3ff55d57b75f75515d44f73d2f8712e24101fc (diff) | |
| download | mongo-b5d97eeeea4ef66731eb273bc484884452991acf.tar.gz | |
Revert "SERVER-15357 Require GCC 4.8.2 now that our Solaris toolchain is updated"
This reverts commit 383c185480fe8c1140e4a4c9671c642470ad429c.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 0edc927f11b..acc8ba859be 100644 --- a/SConstruct +++ b/SConstruct @@ -1127,14 +1127,17 @@ def doConfigure(myenv): } """ % compiler_minimum_string) elif using_gcc(): - compiler_minimum_string = "GCC 4.8.2" + # 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_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__ < 2) + #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 8) || (__GNUC__ == 4 && __GNUC_MINOR__ == 8 && __GNUC_PATCHLEVEL__ < 1) #error %s or newer is required to build MongoDB #endif |