--- Makefile.macosx.orig	2016-05-28 04:30:50.000000000 -0700
+++ Makefile.macosx	2016-12-11 14:07:16.000000000 -0700
@@ -66,18 +66,12 @@
 
 # architectures
 
+C_COMPILER_OPTIONS += $(CFLAGS)
+LINKER_OPTIONS += $(LDFLAGS)
+
 ifeq ($(ARCH),x86-64)
-C_COMPILER_OPTIONS += -m64
-LINKER_OPTIONS += -m64
 # Avoid bus error in install_name_tool
 LINKER_LINK_SHARED_DLOADABLE_OPTIONS += -Wl,-headerpad -Wl,128
-else
-
-ifeq ($(ARCH),universal)
-C_COMPILER_OPTIONS += -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-LINKER_OPTIONS += -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-endif
-
 endif
 
 # select default and internal settings