Save TARGET_CC version in modinfo.sh.

Suggested by: Andrey Borzenkov.
ikozhukhov · Dec 24, 2013 · 6a7957f · 6a7957f
1 parent e88f042
commit 6a7957f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-24  Vladimir Serbinenko  <[email protected]>
+
+	Save TARGET_CC version in modinfo.sh.
+
+	Suggested by: Andrey Borzenkov.
+
 2013-12-24  Vladimir Serbinenko  <[email protected]>
 
 	Make grub_util_devmapper_part_to_disk and grub_util_find_partition_start

diff --git 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
@@ -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@'