mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Merge branch 'tc/meson-cross-compile-fix' into jch
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
This commit is contained in:
@@ -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)
|
||||
|
||||
1
subprojects/.gitignore
vendored
1
subprojects/.gitignore
vendored
@@ -1 +1,2 @@
|
||||
/*/
|
||||
.wraplock
|
||||
|
||||
Reference in New Issue
Block a user