fix spiffs path for openbsd (#193)

plerup · May 12, 2023 · 71be865 · 71be865
1 parent 1f648bb
commit 71be865
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/makeEspArduino.mk b/makeEspArduino.mk
@@ -98,12 +98,12 @@ ifndef ESP_ROOT
   ESP_ARDUINO_VERSION := $(notdir $(ESP_ROOT))
   # Find used version of compiler and tools
   COMP_PATH := $(lastword $(wildcard $(ARDUINO_ESP_ROOT)/tools/xtensa-*/*))
-  MK_FS_PATH := $(lastword $(wildcard $(ARDUINO_ESP_ROOT)/tools/$(MK_FS_MATCH)/*/$(MK_FS_MATCH)))
+  MK_FS_PATH ?= $(lastword $(wildcard $(ARDUINO_ESP_ROOT)/tools/$(MK_FS_MATCH)/*/$(MK_FS_MATCH)))
   PYTHON3_PATH := $(lastword $(wildcard $(ARDUINO_ESP_ROOT)/tools/python3/*))
 else
   # Location defined, assume that it is a git clone
   ESP_ARDUINO_VERSION = $(call git_description,$(ESP_ROOT))
-  MK_FS_PATH := $(lastword $(wildcard $(ESP_ROOT)/tools/$(MK_FS_MATCH)/$(MK_FS_MATCH)))
+  MK_FS_PATH ?= $(lastword $(wildcard $(ESP_ROOT)/tools/$(MK_FS_MATCH)/$(MK_FS_MATCH)))
   PYTHON3_PATH := $(wildcard $(ESP_ROOT)/tools/python3)
 endif
 ESP_ROOT := $(abspath $(ESP_ROOT))

diff --git a/os/OpenBSD.mk b/os/OpenBSD.mk
@@ -20,4 +20,5 @@ CMD_LINE = $(shell ps $$PPID -o command | tail -1)
 OS_NAME = openbsd
 BUILD_THREADS ?= $(shell sysctl -n hw.ncpuonline)
 ARDUINO_LIBS = $(LOCALBASE)/share/arduino/libraries
-CUSTOM_LIBS += $(LOCALBASE)/avr/include
+CUSTOM_LIBS += $(LOCALBASE)/avr/include
+MK_FS_PATH = $(LOCALBASE)/bin/mkspiffs