Make subproject yield options

radareorg · Jan 28, 2025 · c79327c · c79327c
1 parent fa58b43
commit c79327c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/shlr/meson.build b/shlr/meson.build
@@ -24,8 +24,7 @@ else
       'fix-x86-16.patch',
     ]
   elif capstone_version == 'v5'
-    opts = 'plugins='+get_option('plugins')
-    cs = subproject('capstone-v5', default_options: [opts])
+    cs = subproject('capstone-v5')
     patches_files = [
       'fix-x86-16.patch'
     ]

diff --git a/subprojects/packagefiles/capstone-v5/meson_options.txt b/subprojects/packagefiles/capstone-v5/meson_options.txt
@@ -1,2 +1,2 @@
-option('plugins', type: 'string', value: '', description: 'Comma separated list of plugin names')
+option('plugins', type: 'string', value: '', description: 'Comma separated list of plugin names', yield: true)
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		option('plugins', type: 'string', value: '', description: 'Comma separated list of plugin names')
		option('plugins', type: 'string', value: '', description: 'Comma separated list of plugin names', yield: true)