diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2021-02-16 23:41:38 +0000 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2021-02-18 11:26:26 +0000 |
| commit | dba3287bf5dcb2ba0b716749a9a15e7ad43a91f4 (patch) | |
| tree | 554a1b9fbeb879959b899ea8d11684c753f46c6a | |
| parent | ba15d41bdc0f6e949089d71208f8afdc99e1d19b (diff) | |
meson: fix subproject build regression
commit ae9ac2a1 from !165 introduced a regression when
fontconfig is built as a subproject. In that case we
would fail to correctly construct the path to the root
build dir where the meson-info subdirectory resides,
instead looking for it in the fontconfig subproject
subdir. This would result in
FAILED: subprojects/fontconfig/src/fcobjshash.gperf
errors in the cutout.py script.
Instead use the @BUILD_ROOT@ substitution to get
to the build root which will work correctly in
either scenario.
| -rw-r--r-- | src/meson.build | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/meson.build b/src/meson.build index 7f9bf31..73cb2de 100644 --- a/src/meson.build +++ b/src/meson.build @@ -44,13 +44,10 @@ endif cpp += ['-I', join_paths(meson.current_source_dir(), '..')] -# Can use meson.project_build_dir() once we require Meson 0.56 -project_build_dir = meson.current_build_dir() / '..' - fcobjshash_gperf = custom_target('fcobjshash.gperf', input: 'fcobjshash.gperf.h', output: 'fcobjshash.gperf', - command: [python3, files('cutout.py')[0], '@INPUT@', '@OUTPUT@', project_build_dir, cpp], + command: [python3, files('cutout.py')[0], '@INPUT@', '@OUTPUT@', '@BUILD_ROOT@', cpp], build_by_default: true, ) |