RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

cpu/esp32: Evaluate cpp FEATURE with conditional expansion

Browse Source
This commit is contained in:
Leandro Lanzieri 2020-03-09 19:44:40 +01:00
parent 05c37edd42
commit 2f158d7d19
No known key found for this signature in database
GPG Key ID: 39607DE6080007A3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/esp32/Makefile.dep
View File

@ -9,7 +9,6 @@ USEMODULE += pm_layered
ifneq (,$(filter cpp,$(FEATURES_USED)))
USEMODULE += pthread
BASELIBS += -lstdc++
USEMODULE += esp_cxx
endif

7
cpu/esp32/Makefile.include
View File

@ -68,10 +68,9 @@ LINKFLAGS += -T$(RIOTCPU)/$(CPU)/ld/esp32.rom.ld
LINKFLAGS += -T$(RIOTCPU)/$(CPU)/ld/esp32.rom.nanofmt.ld
LINKFLAGS += -nostdlib -lgcc -Wl,-gc-sections
ifneq (,$(filter cpp,$(FEATURES_USED)))
UNDEF += $(BINDIR)/esp_cxx/cxa_guard.o
endif
# NOTE: This check can be turned into a normal conditional after #9913 is fixed
UNDEF += $(if $(filter cpp,$(FEATURES_USED)),$(BINDIR)/esp_cxx/cxa_guard.o)
BASELIBS += $(if $(filter cpp,$(FEATURES_USED)),-lstdc++)
# additional flasher configuration for ESP32 QEMU
ifneq (,$(filter esp_qemu,$(USEMODULE)))