From 0e768ac6e4f2b3ecf5a27003375081c39e5c235e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Sat, 18 Jun 2022 21:57:51 +0200
Subject: [PATCH] [core] Move Arduino flags to arduino-common

---
 builder/arduino-common.py                          | 14 +++++++++++++-
 builder/frameworks/realtek-ambz-arduino.py         |  9 ---------
 .../fixups/WCharacterFixup.h                       |  0
 3 files changed, 13 insertions(+), 10 deletions(-)
 rename platform/{realtek-ambz => common}/fixups/WCharacterFixup.h (100%)

diff --git a/builder/arduino-common.py b/builder/arduino-common.py
index 85a0791..a039135 100644
--- a/builder/arduino-common.py
+++ b/builder/arduino-common.py
@@ -17,8 +17,20 @@ env.Append(
     CPPDEFINES=[
         ("ARDUINO", 10812),
         "ARDUINO_SDK",
-    ]
+    ],
+    LINKFLAGS=[
+        "--specs=nosys.specs",
+        "-Wl,--as-needed",
+        "-Wl,--build-id=none",
+        "-Wl,--cref",
+        "-Wl,--no-enum-size-warning",
+        "-Wl,--no-undefined",
+        "-Wl,--warn-common",
+    ],
 )
+# Arduino core uses __libc_init_array
+if "-nostartfiles" in env["LINKFLAGS"]:
+    env["LINKFLAGS"].remove("-nostartfiles")
 
 # Sources - ArduinoCore-API
 env.AddLibrary(
diff --git a/builder/frameworks/realtek-ambz-arduino.py b/builder/frameworks/realtek-ambz-arduino.py
index 9f92833..2bfdfc7 100644
--- a/builder/frameworks/realtek-ambz-arduino.py
+++ b/builder/frameworks/realtek-ambz-arduino.py
@@ -26,18 +26,9 @@ env.Append(
         ("bool", "bool"),
     ],
     LINKFLAGS=[
-        "--specs=nosys.specs",
-        "-Wl,--as-needed",
-        "-Wl,--build-id=none",
-        "-Wl,--cref",
-        "-Wl,--no-enum-size-warning",
-        "-Wl,--no-undefined",
         "-Wl,--undefined=InfraStart",
-        "-Wl,--warn-common",
     ],
 )
-# Arduino core uses __libc_init_array
-env["LINKFLAGS"].remove("-nostartfiles")
 
 # Build all libraries
 env.BuildLibraries()
diff --git a/platform/realtek-ambz/fixups/WCharacterFixup.h b/platform/common/fixups/WCharacterFixup.h
similarity index 100%
rename from platform/realtek-ambz/fixups/WCharacterFixup.h
rename to platform/common/fixups/WCharacterFixup.h