From 815e5e37687c685122bf32470b20e86f10dc4887 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Mon, 10 Jun 2019 18:11:17 +0200
Subject: [PATCH] fix(build): Actually fix meson scripts

Signed-off-by: Rahix <rahix@rahix.de>
---
 hw-tests/bmatest/meson.build                | 2 +-
 hw-tests/bmetest/meson.build                | 2 +-
 hw-tests/dual-core/meson.build              | 4 ++--
 hw-tests/ecgtest/meson.build                | 2 +-
 hw-tests/hello-freertos/meson.build         | 2 +-
 hw-tests/hello-world/meson.build            | 2 +-
 hw-tests/imutest/meson.build                | 2 +-
 hw-tests/ips/meson.build                    | 2 +-
 lib/sdk/Libraries/Boards/card10/meson.build | 3 +--
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/hw-tests/bmatest/meson.build b/hw-tests/bmatest/meson.build
index 6cf3d401..0f3899a2 100644
--- a/hw-tests/bmatest/meson.build
+++ b/hw-tests/bmatest/meson.build
@@ -4,7 +4,7 @@ executable(
   name + '.elf',
   'main.c',
   dependencies: [libcard10, max32665_startup],
-  link_whole: max32665_startup_lib,
+  link_whole: [max32665_startup_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/bmetest/meson.build b/hw-tests/bmetest/meson.build
index 212ad746..ed1e72b9 100644
--- a/hw-tests/bmetest/meson.build
+++ b/hw-tests/bmetest/meson.build
@@ -4,7 +4,7 @@ executable(
   name + '.elf',
   'main.c',
   dependencies: [libcard10, max32665_startup],
-  link_whole: max32665_startup_lib,
+  link_whole: [max32665_startup_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/dual-core/meson.build b/hw-tests/dual-core/meson.build
index 2fbc9644..783b8775 100644
--- a/hw-tests/dual-core/meson.build
+++ b/hw-tests/dual-core/meson.build
@@ -3,7 +3,7 @@ executable(
   name + '.elf',
   'main.c',
   dependencies: [libcard10, max32665_startup_core0],
-  link_whole: max32665_startup_core0_lib,
+  link_whole: [max32665_startup_core0_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
@@ -14,7 +14,7 @@ executable(
   name + '.elf',
   'core1.c',
   dependencies: [periphdriver, board_card10, max32665_startup_core1],
-  link_whole: max32665_startup_core1_lib,
+  link_whole: [max32665_startup_core1_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/ecgtest/meson.build b/hw-tests/ecgtest/meson.build
index b370a696..7e4f32d0 100644
--- a/hw-tests/ecgtest/meson.build
+++ b/hw-tests/ecgtest/meson.build
@@ -4,7 +4,7 @@ executable(
   name + '.elf',
   'main.c',
   dependencies: [libcard10, max32665_startup],
-  link_whole: max32665_startup_lib,
+  link_whole: [max32665_startup_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/hello-freertos/meson.build b/hw-tests/hello-freertos/meson.build
index c0d54cea..fae1dbd2 100644
--- a/hw-tests/hello-freertos/meson.build
+++ b/hw-tests/hello-freertos/meson.build
@@ -22,7 +22,7 @@ executable(
   include_directories: freertos_sdk_includes,
   dependencies: [libcard10, max32665_startup],
   link_with: freertos,
-  link_whole: max32665_startup_lib,
+  link_whole: [max32665_startup_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/hello-world/meson.build b/hw-tests/hello-world/meson.build
index 258d1cfb..7519ca62 100644
--- a/hw-tests/hello-world/meson.build
+++ b/hw-tests/hello-world/meson.build
@@ -4,7 +4,7 @@ executable(
   name + '.elf',
   'main.c',
   dependencies: [libcard10, max32665_startup],
-  link_whole: max32665_startup_lib,
+  link_whole: [max32665_startup_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/imutest/meson.build b/hw-tests/imutest/meson.build
index 28d89697..18825ee6 100644
--- a/hw-tests/imutest/meson.build
+++ b/hw-tests/imutest/meson.build
@@ -4,7 +4,7 @@ executable(
   name + '.elf',
   'main.c',
   dependencies: [libcard10, max32665_startup],
-  link_whole: max32665_startup_lib,
+  link_whole: [max32665_startup_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/hw-tests/ips/meson.build b/hw-tests/ips/meson.build
index f38fedd3..10ff3cf7 100644
--- a/hw-tests/ips/meson.build
+++ b/hw-tests/ips/meson.build
@@ -6,7 +6,7 @@ executable(
   'image/image.c',
   'image/image2.c',
   dependencies: [libcard10, max32665_startup],
-  link_whole: max32665_startup_lib,
+  link_whole: [max32665_startup_lib, board_card10_lib],
   link_args: [
     '-Wl,-Map=' + meson.current_build_dir() + '/' + name + '.map',
   ],
diff --git a/lib/sdk/Libraries/Boards/card10/meson.build b/lib/sdk/Libraries/Boards/card10/meson.build
index c84a528e..7d28fc04 100644
--- a/lib/sdk/Libraries/Boards/card10/meson.build
+++ b/lib/sdk/Libraries/Boards/card10/meson.build
@@ -11,7 +11,7 @@ sources = files(
   '../Source/stdio.c',
 )
 
-lib = static_library(
+board_card10_lib = static_library(
   'board-card10',
   sources,
   include_directories: includes,
@@ -20,5 +20,4 @@ lib = static_library(
 
 board_card10 = declare_dependency(
   include_directories: includes,
-  link_whole: lib,
 )
-- 
GitLab