Skip to content

Commit

Permalink
scons: due to switch to std c++11 always pass -std=c++11
Browse files Browse the repository at this point in the history
  • Loading branch information
loonycyborg committed Mar 30, 2016
1 parent acc752a commit 0795ad8
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions SConstruct
Expand Up @@ -103,7 +103,6 @@ opts.AddVariables(
BoolVariable('ccache', "Use ccache", False),
('ctool', 'Set c compiler command if not using standard compiler.'),
('cxxtool', 'Set c++ compiler command if not using standard compiler.'),
BoolVariable('cxx0x', 'Use C++0x features.', False),
BoolVariable('openmp', 'Enable openmp use.', False),
BoolVariable("fast", "Make scons faster at cost of less precise dependency tracking.", False),
BoolVariable("lockfile", "Create a lockfile to prevent multiple instances of scons from being run at the same time on this working copy.", False),
Expand Down Expand Up @@ -500,11 +499,8 @@ for env in [test_env, client_env, env]:
if "gcc" in env["TOOLS"]:
env.AppendUnique(CCFLAGS = Split("-W -Wall"), CFLAGS = ["-std=c99"])

if env['cxx0x']:
env.AppendUnique(CXXFLAGS = "-std=c++0x")
env.Append(CPPDEFINES = "HAVE_CXX0X")
else:
env.AppendUnique(CXXFLAGS = "-std=c++98")
env.AppendUnique(CXXFLAGS = "-std=c++11")
env.Append(CPPDEFINES = "HAVE_CXX0X")

if env['openmp']:
env.AppendUnique(CXXFLAGS = ["-fopenmp"], LIBS = ["gomp"])
Expand Down

0 comments on commit 0795ad8

Please sign in to comment.