mirror of
https://github.com/systemd/systemd
synced 2024-07-21 10:17:21 +00:00
meson: move efi summary() section to src/boot/efi
This way we can add the entries more naturally in the same place where they are defined.
This commit is contained in:
parent
65dcf9f9a0
commit
3f871f1205
16
meson.build
16
meson.build
|
@ -43,6 +43,10 @@ endif
|
||||||
skip_deps = want_ossfuzz or want_libfuzzer
|
skip_deps = want_ossfuzz or want_libfuzzer
|
||||||
fuzzer_build = want_ossfuzz or want_libfuzzer
|
fuzzer_build = want_ossfuzz or want_libfuzzer
|
||||||
|
|
||||||
|
# Create a title-less summary section early, so it ends up first in the output.
|
||||||
|
# More items are added later after they have been detected.
|
||||||
|
summary({'build mode' : get_option('mode')})
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
# Try to install the git pre-commit hook
|
# Try to install the git pre-commit hook
|
||||||
|
@ -3887,7 +3891,6 @@ alt_time_epoch = run_command('date', '-Is', '-u', '-d', '@@0@'.format(time_epoch
|
||||||
check : true).stdout().strip()
|
check : true).stdout().strip()
|
||||||
|
|
||||||
summary({
|
summary({
|
||||||
'build mode' : get_option('mode'),
|
|
||||||
'split /usr' : split_usr,
|
'split /usr' : split_usr,
|
||||||
'split bin-sbin' : split_bin,
|
'split bin-sbin' : split_bin,
|
||||||
'prefix directory' : prefixdir,
|
'prefix directory' : prefixdir,
|
||||||
|
@ -3945,17 +3948,6 @@ summary({
|
||||||
# CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}
|
# CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}
|
||||||
# LDFLAGS: ${OUR_LDFLAGS} ${LDFLAGS}
|
# LDFLAGS: ${OUR_LDFLAGS} ${LDFLAGS}
|
||||||
|
|
||||||
if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_GNU_EFI') == 1
|
|
||||||
summary({
|
|
||||||
'EFI machine type' : efi_arch[0],
|
|
||||||
'EFI CC' : '@0@'.format(' '.join(efi_cc)),
|
|
||||||
'EFI LD' : efi_ld,
|
|
||||||
'EFI lds' : efi_lds,
|
|
||||||
'EFI crt0' : efi_crt0,
|
|
||||||
'EFI include directory' : efi_incdir},
|
|
||||||
section : 'Extensible Firmware Interface')
|
|
||||||
endif
|
|
||||||
|
|
||||||
found = []
|
found = []
|
||||||
missing = []
|
missing = []
|
||||||
|
|
||||||
|
|
|
@ -279,6 +279,15 @@ if efi_cc_version.contains('clang') and efi_cc_version.split('.')[0].split(' ')[
|
||||||
efi_ldflags += ['-Wl,-T,' + efi_lds, '-Wno-unused-command-line-argument']
|
efi_ldflags += ['-Wl,-T,' + efi_lds, '-Wno-unused-command-line-argument']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
summary({
|
||||||
|
'EFI machine type' : efi_arch[0],
|
||||||
|
'EFI CC' : '@0@'.format(' '.join(efi_cc)),
|
||||||
|
'EFI LD' : efi_ld,
|
||||||
|
'EFI lds' : efi_lds,
|
||||||
|
'EFI crt0' : efi_crt0,
|
||||||
|
'EFI include directory' : efi_incdir},
|
||||||
|
section : 'Extensible Firmware Interface')
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
efi_headers = files(
|
efi_headers = files(
|
||||||
|
|
Loading…
Reference in a new issue