Skip to content
Snippets Groups Projects
Commit 13e52962 authored by Todd Gamblin's avatar Todd Gamblin
Browse files

Merge pull request #802 from gartung/std-cpp14

Handle c++11 and c++14 correctly
parents 10b0cb10 e92da6a6
No related branches found
No related tags found
No related merge requests found
......@@ -97,6 +97,9 @@ class Compiler(object):
# argument used to get C++11 options
cxx11_flag = "-std=c++11"
# argument used to get C++14 options
cxx14_flag = "-std=c++1y"
def __init__(self, cspec, cc, cxx, f77, fc):
def check(exe):
......
......@@ -54,9 +54,16 @@ def cxx11_flag(self):
if self.version < ver('4.3'):
tty.die("Only gcc 4.3 and above support c++11.")
elif self.version < ver('4.7'):
return "-std=gnu++0x"
return "-std=c++0x"
else:
return "-std=gnu++11"
return "-std=c++11"
@property
def cxx14_flag(self):
if self.version < ver('4.8'):
tty.die("Only gcc 4.8 and above support c++14.")
else:
return "-std=c++14"
@classmethod
def fc_version(cls, fc):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment