Skip to content

Commit

Permalink
SERVER-15357 Require GCC 4.8.2 now that our Solaris toolchain is updated
Browse files Browse the repository at this point in the history
  • Loading branch information
acmorrow committed Dec 5, 2014
1 parent efe02e7 commit 383c185
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 383c185

Please sign in to comment.