walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2692 from ffontaine/master 

src/meson.build: allow introspection when cross-compiling
This commit is contained in:
Khaled Hosny 2020-11-17 08:53:32 +02:00 committed by GitHub
parent 3bd43bd023 0c3dcfae19
commit e6c21d7b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/meson.build
View File

@ -635,12 +635,7 @@ if have_gobject
)
gir = find_program('g-ir-scanner', required: get_option('introspection'))
build_gir = gir.found()
build_gir = build_gir and not meson.is_cross_build()
if not build_gir and get_option('introspection').enabled()
error('Introspection support is requested but it isn\'t available in cross builds')
endif
build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
build_gir = build_gir and get_option('default_library') != 'static'
if not build_gir and get_option('introspection').enabled()