Skip to content

Commit e5dd1fd

Browse files
committed
basic: Move various macros from assert-util.h to assert-fundamental.h
ASSERT_PTR() and friends in assert-fundamental.h make use of assert() and assert_se() which when not building for sd-boot are defined in assert-util.h. Because assert() from glibc is only overridden in assert-util.h, the macros in assert-fundamental.h still end up using the glibc assert. Let's fix this by moving the required macros and related logic to assert-fundamental.h.
1 parent f794eaa commit e5dd1fd

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ endforeach
9292
efi_conf.set_quoted('PROJECT_VERSION', project_major_version)
9393
efi_conf.set_quoted('VERSION_TAG', version_tag)
9494
efi_conf.set('PROJECT_URL', conf.get('PROJECT_URL'))
95+
efi_conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path)
9596

9697
if meson.is_cross_build() and get_option('sbat-distro') == 'auto'
9798
warning('Auto detection of SBAT information not supported when cross-building, disabling SBAT.')

0 commit comments

Comments
 (0)