djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

examples/embedding: Fix example so it compiles again.

Browse Source 
There were a few changes that had broken this example, specifically
2cdf1d25f5 removed file.c from ports/unix.
And (at least for MacOS) mp_state_ctx must be placed in the BSS with
-fno-common so it is visible to the linker.

Signed-off-by: Santeri Paavolainen <santtu@iki.fi>
This commit is contained in:
Santeri Paavolainen 2021-02-24 10:33:26 +02:00 committed by Damien George
parent 7546d3cf73
commit 42035e5ede
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/embedding/Makefile.upylib
View File

@ -21,6 +21,9 @@ CWARN = -Wall -Werror
CWARN += -Wpointer-arith -Wuninitialized CWARN += -Wpointer-arith -Wuninitialized
CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
# Some systems (eg MacOS) need -fno-common so that mp_state_ctx is placed in the BSS.
CFLAGS += -fno-common
# Debugging/Optimization # Debugging/Optimization
ifdef DEBUG ifdef DEBUG
CFLAGS += -g CFLAGS += -g
@ -133,7 +136,6 @@ SRC_C = $(addprefix ports/unix/,\
gccollect.c \ gccollect.c \
unix_mphal.c \ unix_mphal.c \
input.c \ input.c \
file.c \
modmachine.c \ modmachine.c \
modos.c \ modos.c \
moduselect.c \ moduselect.c \
@ -146,6 +148,7 @@ SRC_C = $(addprefix ports/unix/,\
LIB_SRC_C = $(addprefix lib/,\ LIB_SRC_C = $(addprefix lib/,\
$(LIB_SRC_C_EXTRA) \ $(LIB_SRC_C_EXTRA) \
utils/printf.c \ utils/printf.c \
utils/gchelper_generic.c \
timeutils/timeutils.c \ timeutils/timeutils.c \
) )