Skip to content

Commit 33b2314

Browse files
committed
Small tweak to LibFFI targets to avoid rebuilds.
1 parent 4738ecd commit 33b2314

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

Makefile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,9 @@ HOST_ARCH=$(shell uname -m)
115115
all: $(OS_LIST)
116116

117117
.PHONY: \
118-
distclean update-patch \
119-
all $(PRODUCTS) \
120-
clean $(foreach product,$(PRODUCTS),clean-$(product)) \
121-
$(foreach os,$(OS_LIST),Python-$(os)) \
122-
build/macOS/Support/libFFI.xcframework \
123-
vars $(foreach os,$(OS_LIST),vars-$(os))
118+
all clean distclean update-patch vars \
119+
$(foreach product,$(PRODUCTS),$(foreach os,$(OS_LIST),$(product) $(product)-$(os) clean-$(product))) \
120+
$(foreach os,$(OS_LIST),$(os) vars-$(os))
124121

125122
# Clean all builds
126123
clean:
@@ -464,7 +461,7 @@ $$(PYTHON_DIR-$(target))/Makefile: \
464461
$$(XZ_XCFRAMEWORK-$(os)) \
465462
$$(OPENSSL_XCFRAMEWORK-$(os)) \
466463
$$(LIBFFI_XCFRAMEWORK-$(os)) \
467-
Python-macOS \
464+
$$(PYTHON_XCFRAMEWORK-macOS) \
468465
downloads/Python-$(PYTHON_VERSION).tgz
469466
@echo ">>> Unpack and configure Python for $(target)"
470467
mkdir -p $$(PYTHON_DIR-$(target))
@@ -743,7 +740,7 @@ ifneq ($(os),macOS)
743740
LIBFFI_XCFRAMEWORK-$(os)=build/$(os)/Support/libFFI.xcframework
744741
LIBFFI_DIR-$(os)=build/$(os)/libffi-$(LIBFFI_VERSION)
745742

746-
$$(LIBFFI_DIR-$(os))/darwin_common/include/ffi.h: downloads/libffi-$(LIBFFI_VERSION).tgz Python-macOS
743+
$$(LIBFFI_DIR-$(os))/darwin_common/include/ffi.h: downloads/libffi-$(LIBFFI_VERSION).tgz $$(PYTHON_XCFRAMEWORK-macOS)
747744
@echo ">>> Unpack and configure libFFI sources on $(os)"
748745
mkdir -p $$(LIBFFI_DIR-$(os))
749746
tar zxf downloads/libffi-$(LIBFFI_VERSION).tgz --strip-components 1 -C $$(LIBFFI_DIR-$(os))

0 commit comments

Comments
 (0)