--- orig/cctools-822/as/messages.c	2014-11-01 00:19:49.000000000 -0200
+++ orig/cctools-822/as/messages.c	2014-11-01 00:21:27.000000000 -0200
@@ -17,6 +17,25 @@ 
 along with GAS; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+/* gcc uses __has_feature, while OS X libraries now use clang's __has_extension */
+
+#ifndef __has_feature
+  #define __has_feature(x) 0
+#endif
+#ifndef __has_extension
+  #define __has_extension __has_feature
+#endif
+
+#if __has_extension(attribute_deprecated_with_message)
+  #ifndef DEPRECATED_ATTRIBUTE_MESSAGE
+    #define DEPRECATED_ATTRIBUTE_MESSAGE(message) __attribute__((deprecated (message)))
+  #endif
+#else
+  #ifndef DEPRECATED_ATTRIBUTE_MESSAGE
+    #define DEPRECATED_ATTRIBUTE_MESSAGE(message) __attribute__((deprecated))
+  #endif
+#endif
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
--- orig/cctools-822/misc/Makefile	2014-11-01 00:19:49.000000000 -0200
+++ orig/cctools-822/misc/Makefile	2014-11-01 00:20:38.000000000 -0200
@@ -28,7 +28,7 @@ 
 ifeq "" "$(TRIE)"
   LIB_PRUNETRIE =
   else
-  LIB_PRUNETRIE = /usr/local/lib/libprunetrie.a
+  LIB_PRUNETRIE = ../../ld64-128.2/src/libprunetrie.a
 endif
 
 ifneq "" "$(wildcard /bin/mkdirs)"
--- orig/cctools-822/misc/libtool.c	2014-11-01 00:19:49.000000000 -0200
+++ orig/cctools-822/misc/libtool.c	2014-11-01 00:20:38.000000000 -0200
@@ -25,6 +25,26 @@ 
  * and Mach-O objects files (no 4.3bsd a.out files).  This is also the ranlib(1)
  * program.
  */
+
+/* gcc uses __has_feature, while OS X libraries now use clang's __has_extension */
+
+#ifndef __has_feature
+  #define __has_feature(x) 0
+#endif
+#ifndef __has_extension
+  #define __has_extension __has_feature
+#endif
+
+#if __has_extension(attribute_deprecated_with_message)
+  #ifndef DEPRECATED_ATTRIBUTE_MESSAGE
+    #define DEPRECATED_ATTRIBUTE_MESSAGE(message) __attribute__((deprecated (message)))
+  #endif
+#else
+  #ifndef DEPRECATED_ATTRIBUTE_MESSAGE
+    #define DEPRECATED_ATTRIBUTE_MESSAGE(message) __attribute__((deprecated))
+  #endif
+#endif
+
 #include <mach/mach.h>
 #include "stuff/openstep_mach.h"
 #include <libc.h>