From 558553fce13cd68507e74c98522ef6b16ce9f6d6 Mon Sep 17 00:00:00 2001
From: Carlos Pereira Atencio <carlos@microbit.org>
Date: Wed, 8 May 2024 15:06:16 +0100
Subject: [PATCH] codal_port/Makefile: Keep C/C++ flags set up by MicroPython
 lib.

---
 src/codal_port/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/codal_port/Makefile b/src/codal_port/Makefile
index f7694e6..1f41042 100644
--- a/src/codal_port/Makefile
+++ b/src/codal_port/Makefile
@@ -45,7 +45,8 @@ INC += -I$(BUILD)
 CWARN = -Wall -Werror
 CWARN += -Wpointer-arith -Wuninitialized
 CFLAGS_ARCH += -DNRF52833_XXAA
-CFLAGS = $(INC) $(CWARN) -std=c99 $(CFLAGS_MOD) $(CFLAGS_ARCH) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) $(CWARN) -std=c99 $(CFLAGS_MOD) $(CFLAGS_ARCH) $(COPT) $(CFLAGS_EXTRA)
+CXXFLAGS += $(filter-out -std=c99, $(CFLAGS))
 
 # Debugging/Optimization
 ifdef DEBUG
@@ -56,7 +57,7 @@ endif
 
 CFLAGS += -g
 LDFLAGS_ARCH = -Wl,-map,$@.map
-LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
+LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
 
 SRC_C += \
 	drv_display.c \