diff --git a/arch/arm/src/common/Toolchain.defs b/arch/arm/src/common/Toolchain.defs index d4dd89aab78..ac8cfb58219 100644 --- a/arch/arm/src/common/Toolchain.defs +++ b/arch/arm/src/common/Toolchain.defs @@ -232,9 +232,11 @@ else # Wrong warning array subscript [0] is outside array bounds: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523 - GCCVER = $(shell $(CC) --version | grep gcc | sed -r 's/.* ([0-9]+\.[0-9]+\.[0-9]+).*/\1/') + ifeq ($(GCCVER),) + export GCCVER := $(shell $(CC) --version | grep gcc | sed -r 's/.* ([0-9]+\.[0-9]+).*/\1/') + endif - ifeq ($(GCCVER),12.2.1) + ifeq ($(GCCVER),12.2) ARCHOPTIMIZATION += --param=min-pagesize=0 ifeq ($(CONFIG_ARCH_RAMFUNCS),y) LDFLAGS += --no-warn-rwx-segments diff --git a/arch/xtensa/src/esp32/Make.defs b/arch/xtensa/src/esp32/Make.defs index ebc3a520032..27f55b52e29 100644 --- a/arch/xtensa/src/esp32/Make.defs +++ b/arch/xtensa/src/esp32/Make.defs @@ -232,7 +232,9 @@ ifeq ($(CONFIG_ESP32_WIFI),y) CHIP_CSRCS += esp32_wlan.c esp32_wifi_utils.c esp32_wifi_adapter.c EXTRA_LIBS += -lcore -lnet80211 -lpp -lsmartconfig -lespnow -lwpa_supplicant -GCCVER = $(shell $(CC) --version | grep gcc | sed -r 's/.* ([0-9]+\.[0-9]+).*/\1/') +ifeq ($(GCCVER),) + export GCCVER := $(shell $(CC) --version | grep gcc | sed -r 's/.* ([0-9]+\.[0-9]+).*/\1/') +endif ifeq ($(GCCVER),12.2) chip/esp32_wifi_adapter.c_CFLAGS += -Wno-maybe-uninitialized endif diff --git a/libs/libxx/libcxx.defs b/libs/libxx/libcxx.defs index f4312d95888..50963744669 100644 --- a/libs/libxx/libcxx.defs +++ b/libs/libxx/libcxx.defs @@ -84,7 +84,10 @@ libcxx/src/filesystem/operations.cpp_CXXFLAGS += -Wno-shadow # 2676 | const basic_string __temp (__first, __last, __alloc()); # | ^~~~~~ -GCCVER = $(shell $(CXX) --version | grep g++ | sed -r 's/.* ([0-9]+\.[0-9]+).*/\1/') +ifeq ($(GCCVER),) + export GCCVER = $(shell $(CXX) --version | grep g++ | sed -r 's/.* ([0-9]+\.[0-9]+).*/\1/') +endif + ifeq ($(GCCVER),12.2) libcxx/src/filesystem/operations.cpp_CXXFLAGS += -Wno-maybe-uninitialized endif