diff options
| author |   Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 20:03:11 (GMT) |
|---|---|---|
| committer | Dmitry Pankratov <dp@ubiquitech.com> | 2016-11-11 20:03:11 (GMT) |
| commit | 0d17d26005efbd5d6157df0f68a26c738c385ed2 (patch) | |
| tree | 9c25ccb481bd4b58e54c692403d9c49402f09d98 /config/cc/gcc.in | |
| parent | 34ca68e3b076f4a7eea78aa46215fa50dfb1e322 (diff) | |
| parent | 5ebbb52be04e42bbd1c28b903eba642bebaeb1b6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/cc/gcc.in')
| -rw-r--r-- | config/cc/gcc.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 101f2b2..6f6e1a3 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -71,9 +71,9 @@ choice # Don't remove next line # CT_INSERT_VERSION_BELOW -config CC_GCC_V_6_1_0 +config CC_GCC_V_6_2_0 bool - prompt "6.1.0" + prompt "6.2.0" select CC_GCC_6 config CC_GCC_V_5_4_0 @@ -160,6 +160,7 @@ config CC_GCC_5 select CC_GCC_HAS_LNK_HASH_STYLE select CC_GCC_HAS_LIBQUADMATH select CC_GCC_HAS_LIBSANITIZER + select CC_GCC_HAS_LIBMPX select CC_SUPPORT_GOLANG config CC_GCC_5_or_later @@ -178,6 +179,7 @@ config CC_GCC_6 select CC_GCC_HAS_LNK_HASH_STYLE select CC_GCC_HAS_LIBQUADMATH select CC_GCC_HAS_LIBSANITIZER + select CC_GCC_HAS_LIBMPX select CC_SUPPORT_GOLANG config CC_GCC_6_or_later @@ -276,13 +278,16 @@ config CC_GCC_HAS_LIBQUADMATH config CC_GCC_HAS_LIBSANITIZER bool +config CC_GCC_HAS_LIBMPX + bool + if ! CC_GCC_CUSTOM config CC_GCC_VERSION string # Don't remove next line # CT_INSERT_VERSION_STRING_BELOW - default "6.1.0" if CC_GCC_V_6_1_0 + default "6.2.0" if CC_GCC_V_6_2_0 default "5.4.0" if CC_GCC_V_5_4_0 default "linaro-5.2-2015.11-2" if CC_GCC_V_linaro_5_2 default "linaro-4.9-2015.06" if CC_GCC_V_linaro_4_9 |