pinetime/wasp-os
1
0
Fork 0
Code Activity

Fix build up to GCC 13

Browse source 
The errors cannot be disabled individually because the
-Wno-error=some-gcc13-error flags are not recognized by older compilers.

Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
This commit is contained in:
Francesco Gazzetta 2024-04-20 21:45:05 +02:00 committed by Daniel Thompson
parent 1798bc6eea
commit fbf00957dd
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -62,7 +62,13 @@ wasp/boards/$(BOARD_SAFE)/watch.py : wasp/boards/$(BOARD_SAFE)/watch.py.in
|| ($(RM) wasp/boards/$(BOARD)/watch.py; false) || ($(RM) wasp/boards/$(BOARD)/watch.py; false)
micropython/mpy-cross/mpy-cross: micropython/mpy-cross/mpy-cross:
$(MAKE) -C micropython/mpy-cross $(MAKE) -C micropython/mpy-cross \
CWARN="-Wall -Wno-error"
# ^ Disable some Werrors from GCC>=13, specifically
# - dangling-pointer
# - enum-int-mismatch
# TODO update micropython and remove.
# https://github.com/wasp-os/wasp-os/issues/493
micropython: build-$(BOARD_SAFE) wasp/boards/manifest_user_apps.py wasp/boards/$(BOARD_SAFE)/watch.py micropython/mpy-cross/mpy-cross micropython: build-$(BOARD_SAFE) wasp/boards/manifest_user_apps.py wasp/boards/$(BOARD_SAFE)/watch.py micropython/mpy-cross/mpy-cross
$(RM) micropython/ports/nrf/build-$(BOARD)-s132/frozen_content.c $(RM) micropython/ports/nrf/build-$(BOARD)-s132/frozen_content.c
@ -70,7 +76,13 @@ micropython: build-$(BOARD_SAFE) wasp/boards/manifest_user_apps.py wasp/boards/$
BOARD=$(BOARD) SD=s132 \ BOARD=$(BOARD) SD=s132 \
MICROPY_VFS_LFS2=1 \ MICROPY_VFS_LFS2=1 \
FROZEN_MANIFEST=$(CURDIR)/wasp/boards/$(BOARD)/manifest.py \ FROZEN_MANIFEST=$(CURDIR)/wasp/boards/$(BOARD)/manifest.py \
USER_C_MODULES=$(CURDIR)/wasp/modules USER_C_MODULES=$(CURDIR)/wasp/modules \
COPT="-Wno-error"
# ^ Disable some Werrors from GCC>=13, specifically
# - dangling-pointer
# - enum-int-mismatch
# TODO update micropython and remove.
# https://github.com/wasp-os/wasp-os/issues/493
$(PYTHON) -m nordicsemi dfu genpkg \ $(PYTHON) -m nordicsemi dfu genpkg \
--dev-type 0x0052 \ --dev-type 0x0052 \
--application micropython/ports/nrf/build-$(BOARD)-s132/firmware.hex \ --application micropython/ports/nrf/build-$(BOARD)-s132/firmware.hex \