-
Notifications
You must be signed in to change notification settings - Fork 413
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
Fix alert flags so that Merlin understands them #5245
Conversation
Signed-off-by: Andrey Mokhov <[email protected]>
@@ -1,3 +1,3 @@ | |||
(env | |||
(_ | |||
(flags :standard \ -alert=-unstable))) | |||
(flags :standard \ -alert -unstable))) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That'll work for this case, but in general it means: exclude "-alert" and exclude "-unstable" which is not the same as exclude "-alert -unstable". It'll work for us as "-unstable" doesn't appear anywhere else.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, removing flags in this way is unsafe but I guess we don't have a safer mechanism. Hopefully, it'll not bite us in this particular case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the intent is to enable the unstable
alert, I think you can use :standard -alert +unstable
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, good point, let me try that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The intent is to remove the flag because configurator needs to build with 4.02 and 4.02 doesn't know the -alert
flag.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah right, then it doesn't help, sorry for the noise.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, merging as is then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good
As discussed on Slack, it seems that Merlin behaves differently from the compiler when interpreting
alert
flags. As suggested by @voodoos, I'm tweaking the flags to help Merlin a bit. This solves the issue for me locally.