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

meson: Fix check for builtype arguments #183

Merged
merged 1 commit into from
Apr 3, 2020

Conversation

nirbheek
Copy link
Contributor

@nirbheek nirbheek commented Apr 3, 2020

get_option('buildtype') will return 'custom' for most combinations
of -Doptimization and -Ddebug, but those two will always be set
correctly if only -Dbuildtype is set. So we should look at those
options directly.

For the two-way mapping between buildtype and optimization + debug, see this table:
https://mesonbuild.com/Builtin-options.html#build-type-options

Same change as glib: https://gitlab.gnome.org/GNOME/glib/merge_requests/1433

`get_option('buildtype')` will return `'custom'` for most combinations
of `-Doptimization` and `-Ddebug`, but those two will always be set
correctly if only `-Dbuildtype` is set. So we should look at those
options directly.

For the two-way mapping between `buildtype` and `optimization`
+ `debug`, see this table:
https://mesonbuild.com/Builtin-options.html#build-type-options
@nirbheek
Copy link
Contributor Author

nirbheek commented Apr 3, 2020

Test failure seems to be unrelated?

4/21 graphene / box ERROR 0.988502025604248 s

@ebassi
Copy link
Owner

ebassi commented Apr 3, 2020

@nirbheek The transient failure in the graphene_box_t on MSYS2/x86 is known.

@nirbheek
Copy link
Contributor Author

nirbheek commented Apr 3, 2020

Should I re-push till the test passes?

@ebassi
Copy link
Owner

ebassi commented Apr 3, 2020

Nah, it's just annoying, and I care very little about 32bit platforms.

@ebassi ebassi merged commit 2f1b44a into ebassi:master Apr 3, 2020
@nirbheek nirbheek deleted the fix-buildtype-usage branch April 3, 2020 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants