Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add clang c_std=c18 alias #5560

Merged
merged 4 commits into from
Jul 11, 2019
Merged

add clang c_std=c18 alias #5560

merged 4 commits into from
Jul 11, 2019

Conversation

scivision
Copy link
Member

@scivision scivision commented Jun 26, 2019

Fixes #5539

tested on Linux and Windows, Clang 6.0.0 and 8.0.0
Also with Intel C compiler.

Cleaned up c_stds test in run_unittests.py so that's it's readable, correct and deduped.

@scivision scivision added enhancement and removed bug labels Jun 26, 2019
@scivision scivision marked this pull request as ready for review June 26, 2019 01:41
@scivision scivision force-pushed the cstd18_bug branch 3 times, most recently from fc66f4a to 14a43d2 Compare June 26, 2019 03:45
@scivision
Copy link
Member Author

scivision commented Jun 26, 2019

This is the one commit that is new. I seem to have bobbled the rebase and previously merged master commits show up here:
14a43d2

@QuLogic
Copy link
Member

QuLogic commented Jun 26, 2019

Probably you started from your previous PR's state and it got merged in the meantime. Just make sure your master is correctly up-to-date and rebase again. It should drop the extra copies.

@scivision
Copy link
Member Author

The CI had passed, I rebased on upstream/master but the previous master commits are still showing. This has happened to me before soometimes and I don't think it was any issue to merge. The commits tab of this PR https://github.com/mesonbuild/meson/pull/5560/commits shows the one commit for this PR.

@QuLogic
Copy link
Member

QuLogic commented Jun 27, 2019

It's correct now; it was definitely wrong before (I pulled your previous commits to check.)

@scivision
Copy link
Member Author

OK @QuLogic it might have been that I needed to wait a minute or something before refreshing. Now I see that GitHub PR "Files Changed" tab shows what you're saying, just the single commit is needed.

I think this is ready to merge then.

mesonbuild/mesonlib.py Outdated Show resolved Hide resolved
mesonbuild/mesonlib.py Outdated Show resolved Hide resolved
run_unittests.py Outdated Show resolved Hide resolved
run_unittests.py Outdated Show resolved Hide resolved
fix unit test skips for clang c18

correct unittests clang minimum version

cleanup unittest clang skip c_std

finesse unittest vs. clang version
@jpakkane
Copy link
Member

LGTM, feel free to merge if you think it's ok.

@scivision scivision merged commit d5cb1c2 into mesonbuild:master Jul 11, 2019
@scivision scivision deleted the cstd18_bug branch July 11, 2019 23:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Trying to set c_std to 18 and got an error
4 participants