makefiles: fix -nostartfiles

Presence of __dso_handle signal has been solved in RIOT by PR 20348. Thus removal of -nostartfiles option is no more necessary. Also CXXEXFLAGS setup can be done before include of RIOT Makefile.include [1] RIOT-OS/RIOT#20348 Signed-off-by: Gilles DOFFE <g.doffe@gmail.com>
cogip · Apr 21, 2024 · 7da89e3 · 7da89e3
1 parent ce367a2
commit 7da89e3
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/Makefile.include b/Makefile.include
@@ -49,6 +49,12 @@ MCUFW_MODULE_DIRS = " \
 shell_module_dirs = $(wildcard $(MCUFW_MODULE_DIRS:%=$(MCUFIRMWAREBASE)/%/*/shell_*/.))
 EXTERNAL_MODULE_DIRS += $(MCUFW_MODULE_DIRS:%=$(MCUFIRMWAREBASE)/%/) $(shell_module_dirs:%=%/..)
 
+# Use C++20 by default
+CXXEXFLAGS := $(filter-out -std=%, $(CXXEXFLAGS))
+CXXEXFLAGS += -std=c++17
+CXXEXFLAGS += -Wno-pedantic
+CXXEXFLAGS += -Wno-cast-align
+
 # Export mcu-firmware global variables
 include $(MCUFIRMWAREBASE)/makefiles/global_vars.mk.inc
 
@@ -88,18 +94,9 @@ else
 	CFLAGS += -D"MALLINFO_FUNC()=mallinfo()"
 endif
 
-# Use C++14 by default
-tmp_cxxexflags := $(CXXEXFLAGS)
-CXXEXFLAGS = $(filter-out -std=%, $(tmp_cxxexflags))
-CXXEXFLAGS += -std=c++17
-CXXEXFLAGS += -Wno-pedantic
-CXXEXFLAGS += -Wno-cast-align
-
 # Activate asserts debug
 CFLAGS += -DDEBUG_ASSERT_VERBOSE
 
-LINKFLAGS:=$(filter-out -nostartfiles,$(LINKFLAGS))
-
 # Link to librt for timer_* functions definitions
 ifeq ($(CPU),native)
 	LINKFLAGS += -lrt