working on macOS build

Author: kdschlosser

builder/macOS.py

@@ -58,16 +58,14 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
         unix_cmd.append(f'VARIANT={board}')
 
     if lv_cflags:
-        lv_cflags += ' -Wno-missing-field-initializers -Wno-unused-function'
-    else:
-        lv_cflags = '-Wno-missing-field-initializers -Wno-unused-function'
+        unix_cmd.append(f'LV_CFLAGS="{lv_cflags}"')
 
     unix_cmd.extend([
-        f'LV_CFLAGS="{lv_cflags}"',
-        f'LV_PORT=unix',
+        'LV_PORT=unix',
         f'USER_C_MODULES="{script_dir}/ext_mod"',
-        f'CFLAGS=-Wno-unused-function'
+        'CFLAGS_EXTRA=-Wno-unused-function'
     ])
+
     unix_cmd.extend(extra_args)
 
     clean_cmd.extend(unix_cmd[:])

ext_mod/lcd_bus/micropython.mk

@@ -13,10 +13,6 @@ ifneq (,$(findstring -Wno-missing-field-initializers, $(CFLAGS_USERMOD)))
     CFLAGS_USERMOD += -Wno-missing-field-initializers
 endif
 
-ifneq (,$(findstring -Wno-unused-function, $(CFLAGS_USERMOD)))
-    CFLAGS_USERMOD += -Wno-unused-function
-endif
-
 SRC_USERMOD_C += $(MOD_DIR)/modlcd_bus.c
 SRC_USERMOD_C += $(MOD_DIR)/lcd_types.c
 SRC_USERMOD_C += $(MOD_DIR)/common_src/i2c_bus.c

ext_mod/lvgl/micropython.mk

@@ -14,17 +14,12 @@ CFLAGS_USERMOD += -I$(LVGL_BINDING_DIR)
 CFLAGS_USERMOD += -I$(LVGL_DIR)
 CFLAGS_USERMOD += -I$(LVGL_BINDING_DIR)/include
 
-ifneq (,$(findstring -Wno-missing-field-initializers, $(CFLAGS_USERMOD)))
-    CFLAGS_USERMOD += -Wno-missing-field-initializers
-endif
-
-ifneq (,$(findstring -Wno-unused-function, $(CFLAGS_USERMOD)))
-    CFLAGS_USERMOD += -Wno-unused-function
+ifdef $(LV_CFLAGS)
+    CFLAGS_USERMOD += $(LV_CFLAGS)
 endif
 
-ifneq (,$(findstring "", $(LV_CFLAGS)))
-else
-    CFLAGS_USERMOD += $(LV_CFLAGS)
+ifneq (,$(findstring -Wno-missing-field-initializers, $(CFLAGS_USERMOD)))
+    CFLAGS_USERMOD += -Wno-missing-field-initializers
 endif
 
 ALL_LVGL_SRC = $(shell find $(LVGL_DIR) -type f -name '*.h') $(LVGL_BINDING_DIR)/lib/lv_conf.h
@@ -33,7 +28,6 @@ LVGL_MPY = $(BUILD)/lv_mpy.c
 LVGL_MPY_METADATA = $(BUILD)/lv_mpy.json
 
 
-
 SRC_USERMOD_LIB_C += $(shell find $(LVGL_DIR)/src -type f -name "*.c")
 SRC_USERMOD_LIB_C += $(LVGL_ADDON_DIR)/src/color_addons.c
 SRC_USERMOD_C += $(LVGL_MPY)