mirror of
https://github.com/frida/releng.git
synced 2026-11-07 09:36:02 -10:00
meson-make: Scope skip-subprojects to shared
Restrict --skip-subprojects to shared library builds so subproject devkits (gum, gumjs) are still installed in the static/bundled case used by CI.
This commit is contained in:
1 parent
1305fdcd99
commit
cf23ace575
2 files changed
+8
-3
No files matched your search
@@ -232,6 +232,7 @@ def configure(sourcedir: Path,
|
||||
"meson": meson,
|
||||
"build": build_config,
|
||||
"host": host_config if host_config is not build_config else None,
|
||||
"default_library": default_library,
|
||||
"allowed_prebuilds": allowed_prebuilds,
|
||||
"deps": deps_dir,
|
||||
}))
|
||||
|
||||
+7
-3
@@ -53,16 +53,20 @@ def make(sourcedir: Path,
|
||||
|
||||
test_options = shlex.split(environ.get("FRIDA_TEST_OPTIONS", "-v"))
|
||||
|
||||
env_state = pickle.loads((builddir / "frida-env.dat").read_bytes())
|
||||
|
||||
install_options = []
|
||||
if env_state.get("default_library") == "shared":
|
||||
install_options += ["--skip-subprojects"]
|
||||
|
||||
standard_targets = {
|
||||
"all": ["compile"] + compile_options,
|
||||
"clean": ["compile", "--clean"] + compile_options,
|
||||
"distclean": lambda: distclean(sourcedir, builddir),
|
||||
"install": ["install", "--skip-subprojects"],
|
||||
"install": ["install"] + install_options,
|
||||
"test": ["test"] + test_options,
|
||||
}
|
||||
|
||||
env_state = pickle.loads((builddir / "frida-env.dat").read_bytes())
|
||||
|
||||
machine_config = env_state["host"]
|
||||
if machine_config is None:
|
||||
machine_config = env_state["build"]
|
||||
|
||||
Reference in new issue
Block a user