From 63e59043b32988868ce617df01a93a3300ea66fe Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Fri, 2 Feb 2018 09:09:00 +0000 Subject: [PATCH] Surely no need to build 32-bit by default any more; also remove the archive before recreating it (ironically, prompted by refusal of ar to update a fat file which of course is no longer an issue if we're not building 32-bit) --- Makefile.osx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.osx b/Makefile.osx index 4375188..c6ef217 100644 --- a/Makefile.osx +++ b/Makefile.osx @@ -2,7 +2,7 @@ PREFIX := /usr/local CXX := clang++ -stdlib=libc++ CC := clang -ARCHFLAGS := -arch i386 -arch x86_64 -mmacosx-version-min=10.7 +ARCHFLAGS := -arch x86_64 -mmacosx-version-min=10.7 OPTFLAGS := -DNDEBUG -ffast-math -mfpmath=sse -msse -msse2 -O3 -ftree-vectorize CXXFLAGS := $(ARCHFLAGS) $(OPTFLAGS) -I. -Isrc -Irubberband -I/usr/local/include -DUSE_PTHREADS -DMALLOC_IS_ALIGNED -DHAVE_VDSP -DUSE_SPEEX -DNO_THREAD_CHECKS -DNO_TIMING @@ -136,6 +136,7 @@ $(PROGRAM_TARGET): $(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS) $(CXX) -o $@ $^ $(PROGRAM_LIBS) $(LDFLAGS) $(STATIC_TARGET): $(LIBRARY_OBJECTS) + rm $@ $(AR) rsc $@ $^ $(DYNAMIC_TARGET): $(LIBRARY_OBJECTS)