Skip to content

Commit 942f93d

Browse files
fix(build): do not use != assignment in Makefiles (#5464)
GNU Make 3.81 that ships with MacOSX does not understand '!= ...' assignment so we use ':= $(shell ...)' instead which have the same behavior here. Additionally, I have changed the use of 'type' to 'command -v' because assigning the result of 'type' to variable named 'EMMAKE' does not make much sense. I also reused this variable. For more detailed information read the linked issue. Fixes: #5460
1 parent ca89934 commit 942f93d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

examples/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),PLATFORM_WEB PLATFORM_WEB_R
213213
ifeq ($(PLATFORM_OS),WINDOWS)
214214
MAKE = mingw32-make
215215
else
216-
EMMAKE != type emmake
216+
EMMAKE := $(shell command -v emmake)
217217
ifneq (, $(EMMAKE))
218-
MAKE = emmake make
218+
MAKE = $(EMMAKE) make
219219
else
220220
MAKE = mingw32-make
221221
endif

examples/Makefile.Web

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),PLATFORM_WEB PLATFORM_WEB_R
211211
ifeq ($(PLATFORM_OS),WINDOWS)
212212
MAKE = mingw32-make
213213
else
214-
EMMAKE != type emmake
214+
EMMAKE := $(shell command -v emmake)
215215
ifneq (, $(EMMAKE))
216-
MAKE = emmake make
216+
MAKE = $(EMMAKE) make
217217
else
218218
MAKE = mingw32-make
219219
endif

0 commit comments

Comments
 (0)