Verified Commit 6bd36b95 authored by Rahix's avatar Rahix
Browse files

fix(build): Make meson <0.46.0 work


Signed-off-by: Rahix's avatarRahix <rahix@rahix.de>
parent fa3d5c34
...@@ -4,6 +4,7 @@ executable( ...@@ -4,6 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,6 +4,7 @@ executable( ...@@ -4,6 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -3,6 +3,7 @@ executable( ...@@ -3,6 +3,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup_core0], dependencies: [libcard10, max32665_startup_core0],
link_whole: max32665_startup_core0_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
...@@ -13,6 +14,7 @@ executable( ...@@ -13,6 +14,7 @@ executable(
name + '.elf', name + '.elf',
'core1.c', 'core1.c',
dependencies: [periphdriver, board_card10, max32665_startup_core1], dependencies: [periphdriver, board_card10, max32665_startup_core1],
link_whole: max32665_startup_core1_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,6 +4,7 @@ executable( ...@@ -4,6 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -22,6 +22,7 @@ executable( ...@@ -22,6 +22,7 @@ executable(
include_directories: freertos_sdk_includes, include_directories: freertos_sdk_includes,
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_with: freertos, link_with: freertos,
link_whole: max32665_startup_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,6 +4,7 @@ executable( ...@@ -4,6 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -4,6 +4,7 @@ executable( ...@@ -4,6 +4,7 @@ executable(
name + '.elf', name + '.elf',
'main.c', 'main.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -6,6 +6,7 @@ executable( ...@@ -6,6 +6,7 @@ executable(
'image/image.c', 'image/image.c',
'image/image2.c', 'image/image2.c',
dependencies: [libcard10, max32665_startup], dependencies: [libcard10, max32665_startup],
link_whole: max32665_startup_lib,
link_args: [ link_args: [
'-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map', '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
], ],
......
...@@ -8,14 +8,13 @@ sources = files( ...@@ -8,14 +8,13 @@ sources = files(
'./Source/heap.c', './Source/heap.c',
) )
lib = static_library( max32665_startup_lib = static_library(
'max32665-startup', 'max32665-startup',
sources, sources,
dependencies: periphdriver, dependencies: periphdriver,
) )
max32665_startup = declare_dependency( max32665_startup = declare_dependency(
link_whole: lib,
link_args: [ link_args: [
'-T', meson.current_source_dir() + 'Source/GCC/max32665.ld', '-T', meson.current_source_dir() + 'Source/GCC/max32665.ld',
'--entry', 'Reset_Handler', '--entry', 'Reset_Handler',
...@@ -32,14 +31,13 @@ sources = files( ...@@ -32,14 +31,13 @@ sources = files(
'./Source/heap.c', './Source/heap.c',
) )
lib = static_library( max32665_startup_core0_lib = static_library(
'max32665-startup-core0', 'max32665-startup-core0',
sources, sources,
dependencies: periphdriver, dependencies: periphdriver,
) )
max32665_startup_core0 = declare_dependency( max32665_startup_core0 = declare_dependency(
link_whole: lib,
link_args: [ link_args: [
'-T', meson.current_source_dir() + 'Source/GCC/max32665_core0.ld', '-T', meson.current_source_dir() + 'Source/GCC/max32665_core0.ld',
'--entry', 'Reset_Handler', '--entry', 'Reset_Handler',
...@@ -56,14 +54,13 @@ sources = files( ...@@ -56,14 +54,13 @@ sources = files(
'./Source/heap.c', './Source/heap.c',
) )
lib = static_library( max32665_startup_core1_lib = static_library(
'max32665-startup-core1', 'max32665-startup-core1',
sources, sources,
dependencies: periphdriver, dependencies: periphdriver,
) )
max32665_startup_core1 = declare_dependency( max32665_startup_core1 = declare_dependency(
link_whole: lib,
link_args: [ link_args: [
'-T', meson.current_source_dir() + 'Source/GCC/max32665_core1.ld', '-T', meson.current_source_dir() + 'Source/GCC/max32665_core1.ld',
'--entry', 'Reset_Handler', '--entry', 'Reset_Handler',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment