--- a/common/autoconf/build-aux/config.guess	Tue Jun 16 16:11:18 2015 -0700
+++ b/common/autoconf/build-aux/config.guess	Thu Jun 18 10:08:42 2015 +0200
@@ -86,4 +86,11 @@
   fi
 fi
 
+# Test and fix cpu on Macosx when C preprocessor is not on the path
+echo $OUT | grep i386-apple-darwin > /dev/null 2> /dev/null
+if test $? = 0; then
+  REAL_CPU=`uname -m`
+  OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
+fi
+
 echo $OUT