For Darwin do not build fat binaries by default

Now that we detect target arch rather than build arch it seems even
less consistent than before to build fat binaries by default.
This commit is contained in:
katjav 2019-12-15 16:31:21 +01:00
parent 53caa9ca78
commit 2cfb2714a8

View file

@ -538,12 +538,9 @@ endif
#=== flags and paths for Darwin ================================================ #=== flags and paths for Darwin ================================================
# On OSX we try to build fat binaries by default. It is assumed that OSX i386
# can build for ppc and OSX x86_64 can't. TODO: try to refine this condition.
# LLVM-clang doesn't support -fcheck-new, therefore this flag is only used when # LLVM-clang doesn't support -fcheck-new, therefore this flag is only used when
# compiling with g++. # compiling with g++.
ifeq ($(system), Darwin) ifeq ($(system), Darwin)
pkglibdir = $(HOME)/Library/Pd pkglibdir = $(HOME)/Library/Pd
pdincludepath := $(firstword $(wildcard \ pdincludepath := $(firstword $(wildcard \
@ -563,12 +560,11 @@ ifeq ($(system), Darwin)
cxx.flags := -fcheck-new cxx.flags := -fcheck-new
endif endif
version.flag := $(filter $(cflags), -mmacosx-version-min=%) version.flag := $(filter $(cflags), -mmacosx-version-min=%)
arch := $(target.arch)
ifeq ($(target.arch), i386) ifeq ($(target.arch), i386)
arch := ppc i386 x86_64
version.flag = -mmacosx-version-min=10.4 version.flag = -mmacosx-version-min=10.4
endif endif
ifeq ($(target.arch), x86_64) ifeq ($(target.arch), x86_64)
arch := i386 x86_64
version.flag = -mmacosx-version-min=10.6 version.flag = -mmacosx-version-min=10.6
endif endif
ifneq ($(filter -mmacosx-version-min=%, $(cflags)),) ifneq ($(filter -mmacosx-version-min=%, $(cflags)),)