diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-14 17:04:37 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-14 17:04:37 +0900 |
| commit | 25ce0883fe62cd17f8e79d9be05c010b7b59338d (patch) | |
| tree | 2ae77a7a14d98b708247f44cc859e67ff2b3e9f7 | |
| parent | 21787077bf26ed0c68adcaea859a34c04e9e50c7 (diff) | |
| parent | 4061692ba427af2085e934e0734926f93ea2c823 (diff) | |
Merge branch 'tc/meson-cross-compile-fix'
Build fix.
* tc/meson-cross-compile-fix:
meson: use is_cross_build() where possible
meson: only detect ICONV_OMITS_BOM if possible
meson: ignore subprojects/.wraplock
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | subprojects/.gitignore | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meson.build b/meson.build index f1b3615659..00ad8a5c60 100644 --- a/meson.build +++ b/meson.build @@ -1064,7 +1064,7 @@ if iconv.found() } ''' - if compiler.run(iconv_omits_bom_source, + if meson.can_run_host_binaries() and compiler.run(iconv_omits_bom_source, dependencies: iconv, name: 'iconv omits BOM', ).returncode() != 0 @@ -1492,7 +1492,7 @@ if not has_bsd_sysctl endif endif -if not meson.is_cross_build() and compiler.run(''' +if meson.can_run_host_binaries() and compiler.run(''' #include <stdio.h> int main(int argc, const char **argv) diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 63ea916ef5..2bb68c8794 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -1 +1,2 @@ /*/ +.wraplock |