Skip to content

Commit c783a4d

Browse files
committed
Fix deployment target warnings
1 parent 8b1df4f commit c783a4d

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

native/Makefile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -395,11 +395,14 @@ ifeq ($(OS),darwin)
395395
XCODE_VERSION=$(shell xcodebuild -version | grep Xcode | sed 's/^Xcode \([1-9][0-9]*\).*/\1/g')
396396
JAVA_INCLUDES+=-I/System/Library/Frameworks/JavaVM.framework/Headers
397397
DEFAULT_ARCH=$(shell arch)
398+
# Actual deployment target depends on SDK support
399+
MACOSX_DEPLOYMENT_TARGET=10.3
400+
MMACOSX_VERSION_MIN=-mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
398401
ARCH=$(shell arch)
399402
HOST_CONFIG=--host $(ARCH)-apple-darwin
400-
FFI_ENV += CC="$(CC)" CFLAGS="-arch $(ARCH) $(ISYSROOT) $(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)" LD="$(LD) -arch $(ARCH)"
403+
FFI_ENV += CC="$(CC)" CFLAGS="$(MMACOSX_VERSION_MIN) -arch $(ARCH) $(ISYSROOT) $(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)" LD="$(LD) $(MMACOSX_VERSION_MIN) -arch $(ARCH)"
401404
ALT_ARCHS=
402-
ARCHFLAGS=-arch $(ARCH)
405+
ARCHFLAGS=$(MMACOSX_VERSION_MIN) -arch $(ARCH)
403406

404407
# No universal binary for arm64
405408
ifneq ($(ARCH),arm64)
@@ -439,7 +442,6 @@ ifeq ($(OS),darwin)
439442
LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ \
440443
-compatibility_version $(shell echo ${JNA_JNI_VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
441444
-current_version $(JNA_JNI_VERSION) \
442-
-mmacosx-version-min=10.3 \
443445
-framework Foundation \
444446
$(NO_COMPACT_UNWIND) \
445447
-install_name ${@F} \
@@ -456,9 +458,9 @@ endif
456458
$(BUILD)/%.o : %.c dispatch.h protect.h $(FFI_LIB)
457459
@mkdir -p $(BUILD)
458460
ifneq ($(SDKROOT),)
459-
$(CC) $(LOC_CC_OPTS) -arch $(ARCH) $(CFLAGS) -c $< -o $@.$(ARCH)
461+
$(CC) $(LOC_CC_OPTS) $(MMACOSX_VERSION_MIN) -arch $(ARCH) $(CFLAGS) -c $< -o $@.$(ARCH)
460462
for arch in $(ALT_ARCHS); do \
461-
$(CC) $(LOC_CC_OPTS) -arch $$arch -I$(BUILD)/libffi.$$arch/include $(CFLAGS) -c $< -o $@.$$arch; \
463+
$(CC) $(LOC_CC_OPTS) $(MMACOSX_VERSION_MIN) -arch $$arch -I$(BUILD)/libffi.$$arch/include $(CFLAGS) -c $< -o $@.$$arch; \
462464
done
463465
lipo -create -output $@ $@.*
464466
else
@@ -522,8 +524,8 @@ ifneq ($(SDKROOT),)
522524
if [ ! -f $(BUILD)/libffi.$$arch/Makefile ]; then \
523525
echo "Configuring libffi ($$arch)"; \
524526
(cd $(BUILD)/libffi.$$arch \
525-
&& CC="$(CC)" CFLAGS="-arch $$arch $(ISYSROOT) $(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)" \
526-
LDFLAGS="-arch $$arch" \
527+
&& CC="$(CC)" CFLAGS="$(MMACOSX_VERSION_MIN) -arch $$arch $(ISYSROOT) $(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)" \
528+
LDFLAGS="$(MMACOSX_VERSION_MIN) -arch $$arch" \
527529
$(FFI_SRC)/configure $(FFI_CONFIG) --host=$$arch-apple-darwin --disable-dependency-tracking); \
528530
fi; \
529531
$(MAKE) -C $(BUILD)/libffi.$$arch; \

0 commit comments

Comments
 (0)