Skip to content

Commit 0271493

Browse files
committed
Remove MACOSX_DEPLOYMENT_TARGET in FFI Makefile
* Reapplies 9c5932f * It causes `ld: library not found for -lgcc_s.10.4` in CI on Mojave. * Add -Wno-unused-parameter to silence warnings. * Do not try to compile 32-bit as that is warned: ld: warning: The i386 architecture is deprecated for macOS (remove from the Xcode build setting: ARCHS)
1 parent b34002d commit 0271493

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

spec/ffi/fixtures/GNUmakefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ PREFIX = lib
2323
LIBEXT ?= so
2424
LIBNAME = $(PREFIX)test.$(LIBEXT)
2525

26-
export MACOSX_DEPLOYMENT_TARGET=10.4
27-
2826
CCACHE := $(strip $(realpath $(shell which ccache 2> /dev/null)))
2927

3028
TEST_SRCS = $(wildcard $(SRC_DIR)/*.c)
@@ -35,7 +33,7 @@ TEST_OBJS := $(patsubst $(SRC_DIR)/%.c, $(TEST_BUILD_DIR)/%.o, $(TEST_SRCS))
3533
# http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
3634
JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
3735
OFLAGS = -O2 $(JFLAGS)
38-
WFLAGS = -W -Wall -Wno-unused -Wno-parentheses
36+
WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
3937
PICFLAGS = -fPIC
4038
SOFLAGS = -shared
4139
LDFLAGS += $(SOFLAGS)
@@ -58,9 +56,6 @@ ifeq ($(OS), darwin)
5856
ifneq ($(findstring $(CPU),ppc),)
5957
ARCHFLAGS += -arch ppc
6058
endif
61-
ifneq ($(findstring $(CPU),i386 x86_64),)
62-
ARCHFLAGS += -arch i386 -arch x86_64
63-
endif
6459
CFLAGS += $(ARCHFLAGS) -DTARGET_RT_MAC_CFM=0
6560
CFLAGS += -fno-common
6661
LDFLAGS = $(ARCHFLAGS) -dynamiclib

0 commit comments

Comments
 (0)