0ae0996adc
tomlplusplus uses Meson as a build system, which makes us come across a small bug when building Universal Binaries with our custom triplet I hate vendoring this Signed-off-by: Seth Flynn <getchoo@tuta.io>
23 lines
1.6 KiB
Diff
23 lines
1.6 KiB
Diff
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
|
|
index cc0450a52..13501466d 100644
|
|
--- a/mesonbuild/modules/pkgconfig.py
|
|
+++ b/mesonbuild/modules/pkgconfig.py
|
|
@@ -701,16 +701,8 @@ class PkgConfigModule(NewExtensionModule):
|
|
pcfile = filebase + '.pc'
|
|
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():
|
|
- 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:
|
|
- pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('libdir'))), 'pkgconfig')
|
|
- pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
|
|
+ pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('libdir'))), 'pkgconfig')
|
|
+ pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
|
|
relocatable = state.get_option('pkgconfig.relocatable')
|
|
self._generate_pkgconfig_file(state, deps, subdirs, name, description, url,
|
|
version, pcfile, conflicts, variables,
|