From 3385afacd3daabc98e69d1880dad558faa932842 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Tue, 24 Mar 2020 18:55:01 +0430 Subject: [PATCH] [meson] Don't run check-includes if is amalgam build --- src/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index 1c89278c3..c80dff967 100644 --- a/src/meson.build +++ b/src/meson.build @@ -425,13 +425,16 @@ if host_machine.system() != 'windows' and not meson.is_cross_build() 'check-c-linkage-decls.sh', 'check-externs.sh', 'check-header-guards.sh', - 'check-includes.sh', 'check-static-inits.sh', # fails with "check-static-inits.sh: object files not found; skipping test" 'check-symbols.sh', # fails with "'harfbuzz.def' not found; skipping" ] + if not get_option('amalgam') + dist_check_script += ['check-includes.sh'] + endif if false # !WITH_LIBSTDCXX dist_check_script += 'check-libstdc++.sh' # we don't have chosen_linker logic here yet endif + foreach name : dist_check_script env = environment() env.set('srcdir', meson.current_source_dir())