Skip to content

Commit

Permalink
Updated cflags to reference c++14. Removed function that replaces c++…
Browse files Browse the repository at this point in the history
…11 with c++14 when building tests as we are now targeting the min required version
  • Loading branch information
atamagaii committed Jan 28, 2025
1 parent dc53328 commit 201d48b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def search_system_path(file_name: str) -> Optional[str]: # type: ignore # Missi
'-Wno-unused-parameter',
'-fno-rtti',
'-fno-exceptions',
'-std=c++11',
'-std=c++14',
'-fvisibility=hidden', '-pipe',
'-DNINJA_PYTHON="%s"' % options.with_python]
if options.debug:
Expand Down Expand Up @@ -623,8 +623,8 @@ def has_re2c() -> bool:
n.comment('Tests all build into ninja_test executable.')

# Test-specific version of cflags, must include the GoogleTest
# include directory. Also GoogleTest can only build with a C++14 compiler.
test_cflags = [f.replace('std=c++11', 'std=c++14') for f in cflags]
# include directory.
test_cflags = cflags.copy()
test_cflags.append('-I' + os.path.join(gtest_src_dir, 'googletest', 'include'))

test_variables = [('cflags', test_cflags)]
Expand Down

0 comments on commit 201d48b

Please sign in to comment.