Changeset d3357e9 in mainline for boot/meson.build

Timestamp:

2019-08-17T12:49:43Z (5 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:

f69d5a8

Parents:

56440a5

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-30 15:23:58)

git-committer:

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

Message:

Make building bootable images optional

File:

• boot/meson.build (modified) (5 diffs)

boot/meson.build

@@ -81 +81 @@
         endif
 
+        boot_files = static_library('bootfiles', boot_src,
+                include_directories: boot_include_dirs,
+                implicit_include_directories: false,
+                c_args: boot_c_args,
+                pic: false,
+                build_by_default: true,
+        )
+
         # Preprocess linker script using C preprocessor.
         boot_ldscript = custom_target('_link.ld',
@@ -97 +105 @@
                 ],
                 capture: true,
+                build_by_default: true
         )
 
@@ -133 +142 @@
         boot_image_map_path = meson.current_build_dir()/boot_image_name + '.map'
 
-        boot_elf = executable(boot_image_name + '.elf', boot_src, boot_comps_o,
+        boot_elf = executable(boot_image_name + '.elf', boot_comps_o,
                 include_directories: boot_include_dirs,
-                implicit_include_directories: false,
                 c_args: boot_c_args,
                 link_args: boot_c_args + boot_link_args + [
@@ -141 +149 @@
                 ],
                 link_depends: boot_ldscript,
-                install: true,
-                install_dir: 'boot',
+                link_whole: boot_files,
                 pie: false,
+                build_by_default: false,
         )
 
@@ -160 +168 @@
 endif
 
-if POSTBUILD == 'none'
-        POST_INPUT = disabler()
-endif
-
 if POSTBUILD == 'raw'
         POST_INPUT = boot_image