diff --git a/ChangeLog b/ChangeLog index a92251584..b501a0d7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-11-13 Colin Watson + + * acinclude.m4 (grub_apple_cc): Remove; since the removal of nested + functions, we only need to check this for the target, not the host. + * configure.ac (grub_apple_cc): Likewise. + 2013-11-13 Vladimir Serbinenko * grub-core/kern/arm/cache.c (probe_caches): Move asm part to ... diff --git a/acinclude.m4 b/acinclude.m4 index 3d6ffb908..ecbde9594 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -222,21 +222,6 @@ rm -f conftest*]) AC_MSG_RESULT([$grub_cv_i386_asm_addr32])]) -dnl check if our compiler is apple cc -dnl because it requires numerous workarounds -AC_DEFUN([grub_apple_cc], -[AC_REQUIRE([AC_PROG_CC]) -AC_MSG_CHECKING([whether our compiler is apple cc]) -AC_CACHE_VAL(grub_cv_apple_cc, -[if $CC -v 2>&1 | grep "Apple Inc." > /dev/null; then - grub_cv_apple_cc=yes -else - grub_cv_apple_cc=no -fi -]) - -AC_MSG_RESULT([$grub_cv_apple_cc])]) - dnl check if our target compiler is apple cc dnl because it requires numerous workarounds AC_DEFUN([grub_apple_target_cc], diff --git a/configure.ac b/configure.ac index e59937774..00d88e24b 100644 --- a/configure.ac +++ b/configure.ac @@ -349,8 +349,6 @@ case "$host_os" in ;; esac -grub_apple_cc - if test x$USE_NLS = xno; then HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext" fi