Merge commit '1137cca2fadffc1fbb8f0086165ab1076d5100ef'
This commit is contained in:
commit
2a9b1729e2
1 changed files with 8 additions and 5 deletions
|
|
@ -574,11 +574,14 @@ ifeq ($(system), Darwin)
|
||||||
ifeq ($(target.arch), i386)
|
ifeq ($(target.arch), i386)
|
||||||
cxx.flags := -fcheck-new
|
cxx.flags := -fcheck-new
|
||||||
arch := ppc i386 x86_64
|
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
|
arch := i386 x86_64
|
||||||
version.flag ?= -mmacosx-version-min=10.5
|
version.flag = -mmacosx-version-min=10.6
|
||||||
|
endif
|
||||||
|
ifneq ($(filter -mmacosx-version-min=%, $(cflags)),)
|
||||||
|
version.flag := $(filter -mmacosx-version-min=%, $(cflags))
|
||||||
endif
|
endif
|
||||||
arch.c.flags := $(addprefix -arch , $(arch)) $(version.flag)
|
arch.c.flags := $(addprefix -arch , $(arch)) $(version.flag)
|
||||||
arch.ld.flags := $(arch.c.flags)
|
arch.ld.flags := $(arch.c.flags)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue