forked from OSchip/llvm-project
Revert "Don't default older GCC's to C++17, but C++14 or C++11 instead"
The commit isn't quite right, and I want to only have to merge one commit into 4.0 llvm-svn: 292606
This commit is contained in:
parent
2f121b664a
commit
d30625b1fd
|
@ -423,14 +423,6 @@ class Configuration(object):
|
|||
if not std:
|
||||
# Choose the newest possible language dialect if none is given.
|
||||
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?
|
||||
if maj_v <= 5:
|
||||
possible_stds.remove('c++14')
|
||||
for s in possible_stds:
|
||||
if self.cxx.hasCompileFlag('-std=%s' % s):
|
||||
std = s
|
||||
|
|
Loading…
Reference in New Issue