doohoyi/comport
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'configurable-minimum-osxversion'

Browse source 
This merges commit a7d3098 which responded to issue #22. With this commit,
cflag '-mmacosx-version-min=*' from a lib makefile is respected, not
overridden by a default minimum version.
This commit is contained in:
katja 2016-10-27 00:42:45 +02:00
commit ff9b40c451
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile.pdlibbuilder
View file

@ -513,6 +513,7 @@ endif
# LLVM-clang doesn't support -fcheck-new, therefore this flag is omitted for # LLVM-clang doesn't support -fcheck-new, therefore this flag is omitted for
# OSX x86_64. # OSX x86_64.
ifeq ($(system), Darwin) ifeq ($(system), Darwin)
pkglibdir = $(HOME)/Library/Pd pkglibdir = $(HOME)/Library/Pd
pdincludepath := $(firstword $(wildcard \ pdincludepath := $(firstword $(wildcard \
@ -529,15 +530,18 @@ ifeq ($(system), Darwin)
-install_name @loader_path/$(shared.lib) \ -install_name @loader_path/$(shared.lib) \
-compatibility_version 1 -current_version 1.0 -compatibility_version 1 -current_version 1.0
stripflags = -x stripflags = -x
version.flag := $(filter $(cflags), -mmacosx-version-min=%)
ifeq ($(machine), i386) ifeq ($(machine), i386)
cxx.flags := -fcheck-new cxx.flags := -fcheck-new
arch.c.flags := -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 arch := ppc i386 x86_64
arch.ld.flags := -arch ppc -arch i386 -arch x86_64 -mmacosx-version-min=10.4 version.flag ?= -mmacosx-version-min=10.4
endif endif
ifeq ($(machine), x86_64) ifeq ($(machine), x86_64)
arch.c.flags := -arch i386 -arch x86_64 -mmacosx-version-min=10.5 arch := i386 x86_64
arch.ld.flags := -arch i386 -arch x86_64 -mmacosx-version-min=10.5 version.flag ?= -mmacosx-version-min=10.5
endif endif
arch.c.flags := $(addprefix -arch , $(arch)) $(version.flag)
arch.ld.flags := $(arch.c.flags)
endif endif