From b1c2a2f1523146025100ec5dc0f83e666e5d97d6 Mon Sep 17 00:00:00 2001
From: Khoi Hoang <57012152+khoih-prog@users.noreply.github.com>
Date: Sat, 14 Aug 2021 12:21:33 -0400
Subject: [PATCH] Update Adafruit Packages_Patches

---
 .../adafruit/hardware/nrf52/0.23.0/platform.txt            | 7 ++++++-
 .../adafruit/hardware/nrf52/0.24.0/platform.txt            | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Packages_Patches/adafruit/hardware/nrf52/0.23.0/platform.txt b/Packages_Patches/adafruit/hardware/nrf52/0.23.0/platform.txt
index aace5f5..5c9167d 100644
--- a/Packages_Patches/adafruit/hardware/nrf52/0.23.0/platform.txt
+++ b/Packages_Patches/adafruit/hardware/nrf52/0.23.0/platform.txt
@@ -34,7 +34,12 @@ compiler.optimization_flag=-Ofast
 compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g {compiler.warning_flags} {build.float_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
-compiler.c.elf.cmd=arm-none-eabi-gcc
+
+
+# KH, Error here to use gcc, must use g++
+#compiler.c.elf.cmd=arm-none-eabi-gcc
+compiler.c.elf.cmd=arm-none-eabi-g++
+
 compiler.c.elf.flags={compiler.optimization_flag} -Wl,--gc-sections -save-temps
 compiler.S.cmd=arm-none-eabi-gcc
 compiler.S.flags=-mcpu={build.mcu} -mthumb -mabi=aapcs {compiler.optimization_flag} -g -c {build.float_flags} -x assembler-with-cpp
diff --git a/Packages_Patches/adafruit/hardware/nrf52/0.24.0/platform.txt b/Packages_Patches/adafruit/hardware/nrf52/0.24.0/platform.txt
index b552a8d..469647d 100644
--- a/Packages_Patches/adafruit/hardware/nrf52/0.24.0/platform.txt
+++ b/Packages_Patches/adafruit/hardware/nrf52/0.24.0/platform.txt
@@ -34,7 +34,11 @@ compiler.optimization_flag=-Ofast
 compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g {compiler.warning_flags} {build.float_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
-compiler.c.elf.cmd=arm-none-eabi-gcc
+
+# KH, Error here to use gcc, must use g++
+#compiler.c.elf.cmd=arm-none-eabi-gcc
+compiler.c.elf.cmd=arm-none-eabi-g++
+
 compiler.c.elf.flags={compiler.optimization_flag} -Wl,--gc-sections -save-temps
 compiler.S.cmd=arm-none-eabi-gcc
 compiler.S.flags=-mcpu={build.mcu} -mthumb -mabi=aapcs {compiler.optimization_flag} -g -c {build.float_flags} -x assembler-with-cpp