gargoyle from git HEAD; Apple LLVM version 7.0.0 (clang-700.0.72); Mac OS 10.10.5

gargoyle.diff

diff --git a/Jamrules b/Jamrules
index 12fc83f..36ee295 100644
--- a/Jamrules
+++ b/Jamrules
@@ -138,10 +138,10 @@ switch $(OS)
     case MACOSX :
         Echo "OS is MACOSX (cocoa)" ;
         SUFDLL = .dylib ;
-        MAINARCH = -arch i386 ;
+        MAINARCH = -arch x86_64 ;
         CCFLAGS = -Wno-pointer-sign $(MAINARCH) $(ALTARCH) ;
         PKGCONFIG = "pkg-config freetype2" ;
-        GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" ;
+        GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags libpng`" -I/opt/local/include ;
         SHRLINKLIBS += "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ;
         LINKLIBS = "`$(PKGCONFIG) --libs`" -lz -lm ;
         FRAMEWORKS = -framework Cocoa -framework OpenGL ;
@@ -152,7 +152,7 @@ switch $(OS)
             SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
         }
 
-        LINK = $(CC) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) ;
+        LINK = $(CC) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) ;
 
 
     case * :
diff --git a/Jamshared b/Jamshared
index 13db835..fd42928 100644
--- a/Jamshared
+++ b/Jamshared
@@ -79,7 +79,7 @@ if $(OS) = MACOSX
 {
     actions together SharedLink bind NEEDLIBS
     {
-        $(LINK) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS)
+        $(LINK) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS)
     }
 }
 else
diff --git a/gargoyle_osx.sh b/gargoyle_osx.sh
index 44e1675..527bc0d 100644
--- a/gargoyle_osx.sh
+++ b/gargoyle_osx.sh
@@ -12,7 +12,7 @@ mkdir -p $BUNDLE/Resources
 mkdir -p $BUNDLE/PlugIns
 
 rm -rf $GARGDIST
-jam -sUNIVERSAL=yes install
+jam install
 
 for file in `ls $GARGDIST`
 do
@@ -55,4 +55,4 @@ mkdir $BUNDLE/Resources/Fonts
 cp fonts/LiberationMono*.ttf $BUNDLE/Resources/Fonts
 cp fonts/LinLibertine*.otf $BUNDLE/Resources/Fonts
 
-hdiutil create -ov -srcfolder Gargoyle.app/ gargoyle-2011.1-mac.dmg
+hdiutil create -ov -srcfolder Gargoyle.app/ gargoyle-2015.1-mac.dmg
diff --git a/tads/Jamfile b/tads/Jamfile
index 1f8829d..d8455eb 100644
--- a/tads/Jamfile
+++ b/tads/Jamfile
@@ -33,8 +33,8 @@ if $(OS) = LINUX || $(OS) = SOLARIS
 
 if $(OS) = MACOSX
 {
-    SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
-    LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
+    SubDirCcFlags $(MAINARCH) $(ALTARCH) ;
+    LINKFLAGS = $(MAINARCH) $(ALTARCH) ;
 }
 
 SEARCH_SOURCE =
diff --git a/terps/Jamfile b/terps/Jamfile
index b5f6d52..2d1ccdb 100644
--- a/terps/Jamfile
+++ b/terps/Jamfile
@@ -185,8 +185,8 @@ if $(MAKE_GEAS) = yes
 
     if $(OS) = MACOSX
     {
-        SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
-        LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
+        SubDirCcFlags $(MAINARCH) $(ALTARCH) ;
+        LINKFLAGS = $(MAINARCH) $(ALTARCH) ;
     }
 
     SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ;
diff --git a/terps/git/config.h b/terps/git/config.h
index 6eb3667..5252d38 100644
--- a/terps/git/config.h
+++ b/terps/git/config.h
@@ -86,8 +86,8 @@ typedef float git_float;
 
 #if defined(__GNUC__)
 // GCC and compatible compilers such as clang
-#  define maybe_unused  __attribute__((__unused__))
-#  define noreturn      __attribute__((__noreturn__))
+#  define maybe_unused
+#  define noreturn
 #elif defined(_MSC_VER)
 // Microsoft Visual Studio
 #  define maybe_unused