--- imakemdep.h.orig	2012-03-08 16:47:32.000000000 +1100
+++ imakemdep.h	2014-09-28 14:41:15.000000000 +1000
@@ -259,7 +259,7 @@
 #  if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
 
 #   if defined(__APPLE__)
-#    define DEFAULT_CPP "/usr/bin/cpp"
+#    define DEFAULT_CPP "::CPPCMD::"
 #    define DEFAULT_CC "cc"
 #   endif
 #   if defined(Lynx) || defined(__Lynx__)
@@ -324,7 +324,7 @@
 #     define DEFAULT_CPP "/usr/X11R6/bin/cpp"
 #    endif
 #   endif
-#   if defined(__GNUC__) && !defined(USE_CC_E)
+#   if defined(__GNUC__) && !defined(__clang__) && !defined(USE_CC_E)
 #    define USE_CC_E
 #    ifndef DEFAULT_CC
 #     define DEFAULT_CC "gcc"