Skip to content

Commit 652155b

Browse files
Fix pic in meson.build
1 parent 6baba3a commit 652155b

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

meson.build

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2208,7 +2208,8 @@ if have_system
22082208
build_by_default: false,
22092209
sources: slirp_files,
22102210
c_args: slirp_cargs,
2211-
include_directories: slirp_inc)
2211+
include_directories: slirp_inc,
2212+
pic: 'AS_SHARED_LIB' in config_host)
22122213
slirp = declare_dependency(link_with: libslirp,
22132214
dependencies: slirp_deps,
22142215
include_directories: slirp_inc)
@@ -2268,7 +2269,8 @@ if have_system
22682269
libfdt = static_library('fdt',
22692270
build_by_default: false,
22702271
sources: fdt_files,
2271-
include_directories: fdt_inc)
2272+
include_directories: fdt_inc,
2273+
pic: 'AS_SHARED_LIB' in config_host)
22722274
fdt = declare_dependency(link_with: libfdt,
22732275
include_directories: fdt_inc)
22742276
endif
@@ -2605,7 +2607,8 @@ if get_option('b_lto')
26052607
pagevary_flags += '-fno-sanitize=cfi-icall'
26062608
endif
26072609
pagevary = static_library('page-vary-common', sources: pagevary,
2608-
c_args: pagevary_flags)
2610+
c_args: pagevary_flags,
2611+
pic: 'AS_SHARED_LIB' in config_host)
26092612
pagevary = declare_dependency(link_with: pagevary)
26102613
endif
26112614
common_ss.add(pagevary)
@@ -2637,7 +2640,8 @@ common_user = static_library('common-user',
26372640
dependencies: common_user_ss.dependencies(),
26382641
include_directories: common_user_inc,
26392642
name_suffix: 'fa',
2640-
build_by_default: false)
2643+
build_by_default: false,
2644+
pic: 'AS_SHARED_LIB' in config_host)
26412645
common_user = declare_dependency(link_with: common_user)
26422646

26432647
user_ss.add(common_user)
@@ -2738,7 +2742,8 @@ if enable_modules
27382742
input: modinfo_files,
27392743
command: [modinfo_generate, '@INPUT@'],
27402744
capture: true)
2741-
modinfo_lib = static_library('modinfo', modinfo_src)
2745+
modinfo_lib = static_library('modinfo', modinfo_src,
2746+
pic: 'AS_SHARED_LIB' in config_host)
27422747
modinfo_dep = declare_dependency(link_whole: modinfo_lib)
27432748
softmmu_ss.add(modinfo_dep)
27442749
endif

0 commit comments

Comments
 (0)