diff options
| author | trav90 <travawine@openmailbox.org> | 2018-02-04 12:12:38 -0600 |
|---|---|---|
| committer | trav90 <travawine@openmailbox.org> | 2018-02-04 12:12:38 -0600 |
| commit | 048149389cd9d216bd36a2ecde2076312c265c9e (patch) | |
| tree | b464e1f5ea291d7f6905bfd2b354f6c8cd74abe8 | |
| parent | 3ef4f63ec257cf90ad4bf8695a1e4e291f811af2 (diff) | |
| download | UXP-048149389cd9d216bd36a2ecde2076312c265c9e.tar UXP-048149389cd9d216bd36a2ecde2076312c265c9e.tar.gz UXP-048149389cd9d216bd36a2ecde2076312c265c9e.tar.lz UXP-048149389cd9d216bd36a2ecde2076312c265c9e.tar.xz UXP-048149389cd9d216bd36a2ecde2076312c265c9e.zip | |
Require at least GCC 4.9 to build
| -rw-r--r-- | build/moz.configure/toolchain.configure | 4 | ||||
| -rw-r--r-- | mfbt/Compiler.h | 4 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure index 8b2416152..5e9fcc384 100644 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -686,9 +686,9 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None, # Check the compiler version here instead of in `compiler_version` so # that the `checking` message doesn't pretend the compiler can be used # to then bail out one line later. - if info.type == 'gcc' and info.version < '4.8.0': + if info.type == 'gcc' and info.version < '4.9.0': raise FatalCheckError( - 'Only GCC 4.8 or newer is supported (found version %s).' + 'Only GCC 4.9 or newer is supported (found version %s).' % info.version) # If you want to bump the version check here search for diff --git a/mfbt/Compiler.h b/mfbt/Compiler.h index 1bd34d329..a4fb4b5f8 100644 --- a/mfbt/Compiler.h +++ b/mfbt/Compiler.h @@ -26,8 +26,8 @@ # define MOZ_GCC_VERSION_AT_MOST(major, minor, patchlevel) \ ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) \ <= ((major) * 10000 + (minor) * 100 + (patchlevel))) -# if !MOZ_GCC_VERSION_AT_LEAST(4, 8, 0) -# error "mfbt (and Gecko) require at least gcc 4.8 to build." +# if !MOZ_GCC_VERSION_AT_LEAST(4, 9, 0) +# error "mfbt (and Goanna) require at least gcc 4.9 to build." # endif #elif defined(_MSC_VER) diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py index 2ef93792b..c58fde86e 100644 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py @@ -313,7 +313,7 @@ class LinuxToolchainTest(BaseToolchainTest): '/usr/bin/clang-3.3': CLANG_3_3 + CLANG_PLATFORM_X86_64_LINUX, '/usr/bin/clang++-3.3': CLANGXX_3_3 + CLANG_PLATFORM_X86_64_LINUX, } - GCC_4_7_RESULT = ('Only GCC 4.8 or newer is supported ' + GCC_4_7_RESULT = ('Only GCC 4.9 or newer is supported ' '(found version 4.7.3).') GXX_4_7_RESULT = GCC_4_7_RESULT GCC_4_9_RESULT = CompilerResult( |