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

* configure.ac: Restore CFLAGS after efiemu check.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-29 15:12:31 +01:00
parent 403e25a539
commit dfc8aeb042
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Restore CFLAGS after efiemu check.
2012-02-29 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-29 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Move -fnested-functions to CPPFLAGS to workaround * configure.ac: Move -fnested-functions to CPPFLAGS to workaround

2
configure.ac
View file

@ -513,10 +513,12 @@ if test x"$platform" = xefi ; then
fi fi
if test x"$efiemu_excuse" = x ; then if test x"$efiemu_excuse" = x ; then
AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [ AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
SAVED_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib" CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[grub_cv_cc_efiemu=yes], [grub_cv_cc_efiemu=yes],
[grub_cv_cc_efiemu=no]) [grub_cv_cc_efiemu=no])
CFLAGS="$SAVED_CFLAGS"
]) ])
if test x$grub_cv_cc_efiemu = xno; then if test x$grub_cv_cc_efiemu = xno; then
efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib" efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"