vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* acinclude.m4 (grub_apple_cc): Remove; since the removal of nested

Browse source 
functions, we only need to check this for the target, not the host.
* configure.ac (grub_apple_cc): Likewise.
This commit is contained in:
Colin Watson 2013-11-13 12:01:39 +00:00
parent 2bdd07195c
commit 11da14b548
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-13 Colin Watson <cjwatson@ubuntu.com>
* 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 <phcoder@gmail.com> 2013-11-13 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/arm/cache.c (probe_caches): Move asm part to ... * grub-core/kern/arm/cache.c (probe_caches): Move asm part to ...

15
acinclude.m4
View file

@ -222,21 +222,6 @@ rm -f conftest*])
AC_MSG_RESULT([$grub_cv_i386_asm_addr32])]) 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 check if our target compiler is apple cc
dnl because it requires numerous workarounds dnl because it requires numerous workarounds
AC_DEFUN([grub_apple_target_cc], AC_DEFUN([grub_apple_target_cc],

2
configure.ac
View file

@ -349,8 +349,6 @@ case "$host_os" in
;; ;;
esac esac
grub_apple_cc
if test x$USE_NLS = xno; then if test x$USE_NLS = xno; then
HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext" HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
fi fi