# HG changeset patch # User Chris Cannam # Date 1407239755 -3600 # Node ID 490e5d01766c5f94ad7247a6385093ce536545d4 # Parent cb6c59627bcc569a99d0be256beff50edd9ecb98 Some os/x build fixes diff -r cb6c59627bcc -r 490e5d01766c build/Makefile.osx --- a/build/Makefile.osx Tue Aug 05 11:09:58 2014 +0100 +++ b/build/Makefile.osx Tue Aug 05 12:55:55 2014 +0100 @@ -65,16 +65,16 @@ # Our default is to try to build for all architectures supported by # the MINVERSION in a universal binary. # -ARCHFLAGS = -mmacosx-version-min=$(MINVERSION) -arch x86_64 -arch i386 +ARCHFLAGS ?= -mmacosx-version-min=$(MINVERSION) -arch x86_64 -arch i386 # Compile flags # -CFLAGS = $(ARCHFLAGS) -fPIC -CXXFLAGS = $(ARCHFLAGS) -O2 -Wall -I. -I../10.6/inst/include -fPIC +CFLAGS += $(ARCHFLAGS) -fPIC +CXXFLAGS += $(ARCHFLAGS) -O2 -Wall -I. -fPIC # Link flags common to all link targets # -LDFLAGS = $(ARCHFLAGS) +LDFLAGS += $(ARCHFLAGS) # ar, ranlib #