Skip to content

Commit

Permalink
Merge pull request systemd#31829 from keszybz/more-header-checks
Browse files Browse the repository at this point in the history
Update c/c++ version checks and add test for -std=c++26
  • Loading branch information
bluca authored Mar 17, 2024
2 parents e4bdf1d + 3317aed commit 9cebda5
Showing 1 changed file with 18 additions and 19 deletions.
37 changes: 18 additions & 19 deletions src/systemd/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,29 @@ opts = [['c'],
['c', '-std=iso9899:1990'],
['c', '-std=iso9899:2011']]

if cc.has_argument('-std=iso9899:2017')
opts += [['c', '-std=iso9899:2017']]
endif

if cc.has_argument('-std=c2x')
opts += [['c', '-std=c2x']]
endif
foreach opt : ['-std=iso9899:2017',
'-std=c23',
]
if cc.has_argument(opt)
opts += [['c', opt]]
endif
endforeach

if cxx_cmd != ''
opts += [['c++'],
['c++', '-std=c++98'],
['c++', '-std=c++11']]
if cxx.has_argument('-std=c++14')
opts += [['c++', '-std=c++14']]
endif
if cxx.has_argument('-std=c++17')
opts += [['c++', '-std=c++17']]
endif
if cxx.has_argument('-std=c++20')
opts += [['c++', '-std=c++20']]
endif
if cxx.has_argument('-std=c++23')
opts += [['c++', '-std=c++23']]
endif

foreach opt : ['-std=c++14',
'-std=c++17',
'-std=c++20',
'-std=c++23',
'-std=c++26',
]
if cxx.has_argument(opt)
opts += [['c++', opt]]
endif
endforeach
endif

foreach header : _systemd_headers + _not_installed_headers + [libudev_h_path]
Expand Down

0 comments on commit 9cebda5

Please sign in to comment.