lib/cyw43-driver: Pass STATIC macro value for external library build.

As noted in comments, this can be removed once the library is updated to not use STATIC macro. This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <angus@redyak.com.au>
micropython · Mar 4, 2024 · a61bc35 · a61bc35
1 parent 2465c82
commit a61bc35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
@@ -409,6 +409,7 @@ ifeq ($(MICROPY_PY_NETWORK_CYW43),1)
 CYW43_DIR = lib/cyw43-driver
 GIT_SUBMODULES += $(CYW43_DIR)
 CFLAGS_EXTMOD += -DMICROPY_PY_NETWORK_CYW43=1
+CFLAGS_THIRDPARTY += -DSTATIC=static  # Remove once lib/cyw43-driver no longer uses STATIC macro
 SRC_THIRDPARTY_C += $(addprefix $(CYW43_DIR)/src/,\
 	cyw43_ctrl.c \
 	cyw43_lwip.c \

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
@@ -348,6 +348,12 @@ if (MICROPY_PY_NETWORK_CYW43)
         ${MICROPY_DIR}/lib/cyw43-driver/
     )
 
+    # Can be removed once lib/cyw43-driver submodule no longer uses STATIC
+    set_source_files_properties(
+        ${PICO_CYW43_DRIVER_PATH}/src/cyw43_lwip.c
+        PROPERTIES
+        COMPILE_OPTIONS
+        -DSTATIC=static)
 endif()
 
 if (MICROPY_PY_NETWORK_NINAW10)