From 403e25a539a753c7937c48bac502f0c5019f423d Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 29 Feb 2012 15:10:13 +0100 Subject: [PATCH] * configure.ac: Move -fnested-functions to CPPFLAGS to workaround Apple bug. --- ChangeLog | 5 +++++ configure.ac | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29577d8c0..df2789bb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-29 Vladimir Serbinenko + + * configure.ac: Move -fnested-functions to CPPFLAGS to workaround + Apple bug. + 2012-02-29 Vladimir Serbinenko * grub-core/Makefile.am (MACHO2IMG): Add missing variable. diff --git a/configure.ac b/configure.ac index 6a9eafd39..b50f3c930 100644 --- a/configure.ac +++ b/configure.ac @@ -301,8 +301,8 @@ AC_CHECK_SIZEOF(long) grub_apple_cc if test x$grub_cv_apple_cc = xyes ; then - HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1" - HOST_CFLAGS="$HOST_CFLAGS -fnested-functions" + HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1 -fnested-functions" + HOST_CFLAGS="$HOST_CFLAGS" fi if test x$USE_NLS = xno; then @@ -454,7 +454,7 @@ fi grub_apple_target_cc if test x$grub_cv_apple_target_cc = xyes ; then TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DAPPLE_CC=1" - TARGET_CFLAGS="$TARGET_CFLAGS -fnested-functions" + TARGET_CPPFLAGS="$TARGET_CPPFLAGS -fnested-functions" CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions" TARGET_APPLE_CC=1