Save TARGET_CC version in modinfo.sh.

	Suggested by: Andrey Borzenkov.

diff --git a/ChangeLog b/ChangeLog
index d08793254d2a0efe654e64597ee382245c62d528..65e8a1e032dd5bdfc498123d9ee04c9d941b0ec3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Save TARGET_CC version in modinfo.sh.
+
+       Suggested by: Andrey Borzenkov.
+
 2013-12-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Make grub_util_devmapper_part_to_disk and grub_util_find_partition_start

diff --git a/configure.ac b/configure.ac
index 77c942a29f3b9747fcf29af76b3c847f8601b394..2aa2fb3b18e0c390fbe875880d6a8c4c59f83a8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -503,6 +503,8 @@ if test "x$target_cpu" != xi386 && test "x$target_cpu" != xx86_64; then
 TARGET_CFLAGS="$TARGET_CFLAGS -Wcast-align"
 fi
 
+TARGET_CC_VERSION="$(LC_ALL=C $TARGET_CC --version | head -n1)"
+
 AC_CACHE_CHECK([which extra warnings work], [grub_cv_target_cc_w_extra_flags], [
   LDFLAGS="$TARGET_LDFLAGS -nostdlib -static"
 
@@ -1605,6 +1607,7 @@ AC_SUBST(TARGET_CPP)
 AC_SUBST(TARGET_CCAS)
 AC_SUBST(TARGET_OBJ2ELF)
 AC_SUBST(TARGET_MODULE_FORMAT)
+AC_SUBST(TARGET_CC_VERSION)
 
 AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)

diff --git a/grub-core/modinfo.sh.in b/grub-core/modinfo.sh.in
index d46b56c070b50fb34efd87511b481d591e0180a4..69d833432d1e8b05c0a1c25b939715f01d7d5fb6 100644 (file)
--- a/grub-core/modinfo.sh.in
+++ b/grub-core/modinfo.sh.in
@@ -16,6 +16,7 @@ grub_end_symbol="@END_SYMBOL@"
 
 # Build environment
 grub_target_cc='@TARGET_CC@'
+grub_target_cc_version='@TARGET_CC_VERSION@'
 grub_target_cflags='@TARGET_CFLAGS@'
 grub_target_cppflags='@TARGET_CPPFLAGS@'
 grub_target_ccasflags='@TARGET_CCASFLAGS@'