646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
17 lines
989 B
Diff
17 lines
989 B
Diff
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
|
|
index cc0450a52..183555c48 100644
|
|
--- a/mesonbuild/modules/pkgconfig.py
|
|
+++ b/mesonbuild/modules/pkgconfig.py
|
|
@@ -702,10 +702,7 @@ class PkgConfigModule(NewExtensionModule):
|
|
pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
|
|
if pkgroot is None:
|
|
m = state.environment.machines.host
|
|
- if m.is_freebsd():
|
|
- pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'libdata', 'pkgconfig')
|
|
- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
|
|
- elif m.is_haiku():
|
|
+ if m.is_haiku():
|
|
pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
|
|
pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig')
|
|
else:
|