STASH

d4nuu8 · Jan 22, 2025 · c2ec953 · c2ec953
1 parent 003d070
commit c2ec953
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/bootloader/meson.build b/bootloader/meson.build
@@ -4,6 +4,11 @@ dependencies = []
 
 if kconfig.has_key('CONFIG_UBOOT')
 	sources += 'uboot.c'
+
+	if kconfig.has_key('CONFIG_BOOTLOADER_STATIC_LINKED')
+		# TODO Use dependency() as soon as meson 0.63 can be used
+		dependencies += cc.find_library('ubootenv', required: true, static: true)
+	endif
 endif
 
 if kconfig.has_key('CONFIG_BOOTLOADER_NONE')
@@ -20,15 +25,15 @@ if kconfig.has_key('CONFIG_BOOTLOADER_EBG')
 	sources += 'ebg.c'
 
 	if kconfig.has_key('CONFIG_BOOTLOADER_STATIC_LINKED')
-		dependencies += dependency('libebgenv', required: true)
+		dependencies += dependency('libebgenv', required: true, static: true)
 	endif
 endif
 
 if kconfig.has_key('CONFIG_BOOTLOADER_CBOOT')
 	sources += 'cboot.c'
 
 	if kconfig.has_key('CONFIG_BOOTLOADER_STATIC_LINKED')
-		dependencies += dependency('tegra-boot-tools', required: true)
+		dependencies += dependency('tegra-boot-tools', required: true, static: true)
 	endif
 endif
 

diff --git a/core/meson.build b/core/meson.build
@@ -23,7 +23,14 @@ sources = [
 	'util.c',
 ]
 
-ubootenv_lib = cc.find_library('ubootenv', required: true)
+# ubootenv_lib = cc.find_library('ubootenv', required: true)
+if kconfig.has_key('CONFIG_BOOTLOADER_STATIC_LINKED')
+	# TODO Use dependency() as soon as meson 0.63 can be used
+	ubootenv_lib = [
+		cc.find_library('ubootenv', required: true, static: true),
+		cc.find_library('yaml', required: true, static: true),
+	]
+endif
 
 dependencies = [json_dep, ubootenv_lib]