Skip to content

options: process project options before machine options #14611

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

bonzini
Copy link
Collaborator

@bonzini bonzini commented May 15, 2025

I'm not sure if this is the right fix or too big a hammer, but let's try.

Fixes: #14608

@bonzini bonzini marked this pull request as ready for review May 15, 2025 17:41
@bonzini bonzini requested a review from jpakkane as a code owner May 15, 2025 17:41
@bonzini bonzini added this to the 1.8.1 milestone May 15, 2025
@bonzini bonzini added regression options Meson configuration options labels May 15, 2025
@bonzini
Copy link
Collaborator Author

bonzini commented May 15, 2025

Old code indeed used the same order as after the patch. From CoreData.set_default_options:

        options: T.MutableMapping[OptionKey, T.Any] = OrderedDict()
        for k, v in default_options.items(): # process project default options
            if not subproject or k.subproject == subproject:
                options[k] = v
        options.update(env.options)          # override them with machine default and command line options
        env.options = options

@bonzini
Copy link
Collaborator Author

bonzini commented May 16, 2025

@jpakkane can you confirm that this wasn't intentional?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
options Meson configuration options regression
Projects
None yet
Development

Successfully merging this pull request may close these issues.

meson 1.8 ignores buildtype defined in native-file
1 participant