Skip to content

Commit 4a99d0f

Browse files
Fix compilation issue on macOS
1 parent 97a4150 commit 4a99d0f

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Makefile.rules

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ endif
4040
endif
4141
endif
4242

43-
define uniq =
44-
$(eval seen :=)
45-
$(foreach _,$1,$(if $(filter $_,${seen}),,$(eval seen += $_)))
46-
${seen}
47-
endef
43+
uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
4844

4945
define check_duplicate =
5046
$(eval LIST := $(sort $(foreach file_h, $(notdir $1), $(notdir $(shell find $2 -name $(file_h))))))

Makefile.standard_app

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ endif
164164

165165
ifneq ($(DISABLE_STANDARD_WEBUSB), 1)
166166
APP_WEBUSB_URL ?= ""
167-
WEBUSB_URL_SIZE_B = $(shell echo -n $(APP_WEBUSB_URL) | wc -c)
167+
WEBUSB_URL_SIZE_B = $(shell echo -n $(APP_WEBUSB_URL) | wc -c | xargs)
168168
WEBUSB_URL=$(shell echo -n $(APP_WEBUSB_URL) | sed -e "s/./\\\'\0\\\',/g")
169169
DEFINES += HAVE_WEBUSB WEBUSB_URL_SIZE_B=$(WEBUSB_URL_SIZE_B) WEBUSB_URL=$(WEBUSB_URL)
170170
endif

0 commit comments

Comments
 (0)