Don't default older GCC's to C++17, but C++14 or C++11 instead
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292607 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -423,6 +423,15 @@ class Configuration(object):
|
|||||||
if not std:
|
if not std:
|
||||||
# Choose the newest possible language dialect if none is given.
|
# Choose the newest possible language dialect if none is given.
|
||||||
possible_stds = ['c++1z', 'c++14', 'c++11', 'c++03']
|
possible_stds = ['c++1z', 'c++14', 'c++11', 'c++03']
|
||||||
|
if self.cxx.type == 'gcc':
|
||||||
|
maj_v, _, _ = self.cxx.version
|
||||||
|
maj_v = int(maj_v)
|
||||||
|
if maj_v < 7:
|
||||||
|
possible_stds.remove('c++1z')
|
||||||
|
# FIXME: How many C++14 tests actually fail under GCC 5 and 6?
|
||||||
|
# Should we XFAIL them individually instead?
|
||||||
|
if maj_v <= 6:
|
||||||
|
possible_stds.remove('c++14')
|
||||||
for s in possible_stds:
|
for s in possible_stds:
|
||||||
if self.cxx.hasCompileFlag('-std=%s' % s):
|
if self.cxx.hasCompileFlag('-std=%s' % s):
|
||||||
std = s
|
std = s
|
||||||
|
|||||||
Reference in New Issue
Block a user