-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Fix regression with android_exe_type
#15241
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 regression with android_exe_type
#15241
Conversation
Which removes the need to assert it.
|
@sp1ritCS: I don't have a setup to test, but just by inspection I think I found the issue, but I'd appreciate if you could test that this works for you. |
|
Negative, the error still occurs. I've done some basic printf debugging (logging what gets set in the sh_kwarg loop) and the problem is that the RUST_ABI arg isn't part of EXCLUSIVE_SHARED_LIB_KWS :) |
|
This should work but on top of this the rust_crate_type should be changed to |
7da70ec to
07c6629
Compare
|
I would have thought it would have done what @bonzini said, but I've made it explicitly set the rust_abi and rust_crate_type as we would expect now. |
|
This works now. Tho I guess it is less "robust" that the commit header makes it out to be, in case
|
|
I looked into why it's doing what it's doing, and both @bonzini and I were off because the default for The robustness thing is true though, since it fills in all of the shared library fields that that are expected. |
|
Maybe that should be broken into two patches? |
|
I think this PR is good as is, except for possibly adding a similar loop involving |
…rguments This extends the code that strips executable keyword arguments to also default populate shared_library exclusive arguments. Fixes: mesonbuild#15238
07c6629 to
c28fe88
Compare
|
I had another idea, I think this is even a little better, @bonzini let me know what you think. |
|
Oh yeah, that makes a lot of sense! |
I think this is simply a case where the code that converted the executable arguments to shared_library arguments happened to work, but wasn't exactly correct. I've attempted to make the conversion robust, but I don't have an Android cross setup to test with.
Fixes: #15238