646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
--- a/ports/unix/Makefile
|
|
+++ b/ports/unix/Makefile
|
|
@@ -31,7 +31,7 @@
|
|
QSTR_GLOBAL_DEPENDENCIES += $(VARIANT_DIR)/mpconfigvariant.h
|
|
|
|
# OS name, for simple autoconfig
|
|
-UNAME_S := $(shell uname -s)
|
|
+UNAME_S := @UNAME_S@
|
|
|
|
# include py core make definitions
|
|
include $(TOP)/py/py.mk
|
|
@@ -151,7 +151,7 @@
|
|
# If the variant enables it, enable modbluetooth.
|
|
ifeq ($(MICROPY_PY_BLUETOOTH),1)
|
|
ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
|
|
-HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1')
|
|
+HAVE_LIBUSB := $(shell (which @PKG_CONFIG@ > /dev/null && @PKG_CONFIG@ --exists libusb-1.0) 2>/dev/null && echo '1')
|
|
|
|
# Figure out which BTstack transport to use.
|
|
ifeq ($(HAVE_LIBUSB),1)
|
|
@@ -180,8 +180,8 @@
|
|
endif
|
|
else
|
|
# Use system version of libffi.
|
|
-LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi)
|
|
-LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi)
|
|
+LIBFFI_CFLAGS := $(shell @PKG_CONFIG@ --cflags libffi)
|
|
+LIBFFI_LDFLAGS := $(shell @PKG_CONFIG@ --libs libffi)
|
|
endif
|
|
|
|
ifeq ($(UNAME_S),Linux)
|