Skip to content

Commit 25ce088

Browse files
committed
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
2 parents 2178707 + 4061692 commit 25ce088

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ if iconv.found()
10641064
}
10651065
'''
10661066

1067-
if compiler.run(iconv_omits_bom_source,
1067+
if meson.can_run_host_binaries() and compiler.run(iconv_omits_bom_source,
10681068
dependencies: iconv,
10691069
name: 'iconv omits BOM',
10701070
).returncode() != 0
@@ -1492,7 +1492,7 @@ if not has_bsd_sysctl
14921492
endif
14931493
endif
14941494

1495-
if not meson.is_cross_build() and compiler.run('''
1495+
if meson.can_run_host_binaries() and compiler.run('''
14961496
#include <stdio.h>
14971497
14981498
int main(int argc, const char **argv)

subprojects/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/*/
2+
.wraplock

0 commit comments

Comments
 (0)