--- glib/gconvert.c.dist	2008-09-12 10:55:51.000000000 -0700
+++ glib/gconvert.c	2013-07-08 17:23:57.000000000 -0700
@@ -52,7 +52,9 @@
 #error GNU libiconv in use but included iconv.h not from libiconv
 #endif
 #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
-#error GNU libiconv not in use but included iconv.h is from libiconv
+  #if !defined (__APPLE_CC__) && !defined (__LP_64__)
+    #error GNU libiconv not in use but included iconv.h is from libiconv
+  #endif
 #endif
 
 #include "galias.h"