Changeset b2695b9 in mainline for kernel/meson.build

Timestamp:

2019-08-17T12:49:43Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

123cd6d

Parents:

740e952

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-27 16:44:01)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

More tweaks and switch to building the dist directory during the build stage, not install stage

File:

• kernel/meson.build (modified) (3 diffs)

kernel/meson.build

@@ -127 +127 @@
 foreach iter : iterations
         is_last = (iter == iterations.length())
-        kernel_name = is_last ? 'kernel' : 'kernel.@0@'.format(iter)
+        kernel_name = 'kernel.@0@.elf'.format(iter)
         kernel_map_name = kernel_name + '.map'
         kernel_map_path = meson.current_build_dir() / kernel_map_name
 
-        kernel_elf = executable(kernel_name + '.elf', kernel_map_S,
+        kernel_elf = executable(kernel_name, kernel_map_S,
                 include_directories: kernel_include_dirs,
                 implicit_include_directories: false,
@@ -167 +167 @@
 
 install_files += [[ 'boot', kernel_elf.full_path(), 'kernel.elf' ]]
+install_deps += [ kernel_elf ]
 
-kernel_disasm = custom_target(kernel_name + '.disasm',
+kernel_disasm = custom_target('kernel.elf.disasm',
         command: [ objdump, '-S', '@INPUT@' ],
         input: kernel_elf,
-        output: kernel_name + '.disasm',
+        output: 'kernel.elf.disasm',
         capture: true,
         build_by_default: true,
@@ -179 +180 @@
 if false
         install_files += [[ 'boot', kernel_disasm.full_path(), 'kernel.elf.disasm' ]]
+        install_deps += [ kernel_disasm ]
 endif