]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
* configure.ac: Set CPP to build one when checkoing for freetype for
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 22 Aug 2013 16:56:00 +0000 (18:56 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 22 Aug 2013 16:56:00 +0000 (18:56 +0200)
build.

ChangeLog
configure.ac

index 8f197399aa8bcf15933906ebe7c5e375c2d62c9e..361faaa142289efbfef4cf158bec82a52df38d9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * configure.ac: Set CPP to build one when checkoing for freetype for
+       build.
+
 2013-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkfont.c [!GRUB_BUILD]: Define my_argp_state.
index 7a927f1749f9057d1397ef75ab0ee18b528ed47c..de9cb24a5b64bb6eb7702637c72e9dc998bf9345 100644 (file)
@@ -395,6 +395,7 @@ fi
 HOST_CC=$CC
 AC_CHECK_PROGS(BUILD_CC, [gcc egcs cc])
 test -z "$BUILD_CC" && AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.])
+BUILD_CPP="$BUILD_CC -E"
 
 # For gnulib.
 gl_INIT
@@ -990,9 +991,11 @@ AC_SUBST([freetype_cflags])
 AC_SUBST([freetype_libs])
 
 SAVED_CC="$CC"
+SAVED_CPP="$CPP"
 SAVED_CFLAGS="$CFLAGS"
 SAVED_CPPFLAGS="$CPPFLAGS"
 CC="$BUILD_CC"
+CPP="$BUILD_CPP"
 CFLAGS="$BUILD_CFLAGS"
 CPPFLAGS="$BUILD_CPPFLAGS"
 
@@ -1046,6 +1049,7 @@ AC_SUBST([build_freetype_cflags])
 AC_SUBST([build_freetype_libs])
 
 CC="$SAVED_CC"
+CPP="$SAVED_CPP"
 CFLAGS="$SAVED_CFLAGS"
 CPPFLAGS="$SAVED_CPPFLAGS"