8000 compat: Stop forwarding the parent's assets option by oleavr · Pull Request #1294 · frida/frida-core · GitHub
[go: up one dir, main page]

Skip to content

compat: Stop forwarding the parent's assets option - #1294

Merged
oleavr merged 2 commits into
mainfrom
compat-root-options
Nov 12, 2026
Merged

oleavr merged 2 commits into
mainfrom
compat-root-options

Conversation

@oleavr
@oleavr oleavr commented Nov 12, 2026 •
Copy link
Copy Markdown
Member

Meson's option store spells root project options with a leading :, so the
parent's -D:assets=auto slipped past OVERRIDDEN_COMPAT_OPTIONS and
replaced the sub-build's -Dassets=installed. In builds with installed
assets, such as --enable-shared --without-prebuilds=sdk on macOS, the arm64e
sub-build then failed with "At least one agent must be provided", as its
frida-server wanted an embedded agent.

option_should_be_forwarded() already holds back every other option the
sub-build sets itself, so hold assets back there too and drop the separate
override list.

The same spelling meant the -Dfrida_version= check never matched; append the
resolved version unconditionally instead.

The override check missed the store's -D:assets spelling, so the
parent's assets=auto replaced the sub-build's assets=installed. Hold
assets back with the other options the sub-build sets itself, and drop
the separate override list.
The check for -Dfrida_version never matched the store's
-D:frida_version spelling. Append the version the parent resolved
unconditionally.
@oleavr
oleavr force-pushed the compat-root-options branch from f1241eb to 61cd524 Compare November 12, 2026 09:11
@oleavr oleavr changed the title compat: Fix assets override with option store compat: Stop forwarding the parent's assets option Nov 12, 2026
@oleavr
oleavr merged commit d9bbc37 into main Nov 12, 2026
4 of 72 checks passed
@oleavr
oleavr deleted the compat-root-options branch November 12, 2026 09:13
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.

1 participant

0