Skip to content

Commit 38e15e6

Browse files
committed
build: Remove explict -lstdc++-psram-workaround
This is now handled internally to the toolchain.
1 parent 853736a commit 38e15e6

File tree

3 files changed

+0
-8
lines changed

3 files changed

+0
-8
lines changed

components/esp32/Makefile.projbuild

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,5 @@ endif # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION
3636
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
3737
CFLAGS+=-mfix-esp32-psram-cache-issue
3838
CXXFLAGS+=-mfix-esp32-psram-cache-issue
39-
#Filter out the standard libstdc++ linkage. The component.mk will add a specific
40-
#cache-workaround-enabled version.
41-
LDFLAGS:=$(filter-out -lstdc++,$(LDFLAGS))
4239
endif
4340

components/esp32/component.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/libhal.a \
3838
-u ld_include_panic_highint_hdl \
3939
$(addprefix -T ,$(LINKER_SCRIPTS))
4040

41-
#The cache workaround also needs a c++ standard library recompiled with the workaround.
42-
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
43-
COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/libstdc++-psram-workaround.a
44-
endif
45-
4641
ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
4742

4843
COMPONENT_SUBMODULES += lib
-15.9 MB
Binary file not shown.

0 commit comments

Comments
 (0)