From 6a7957f9f5d5c99c43ed37b1d06fe43c1187b3c3 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 24 Dec 2013 14:47:44 +0100 Subject: [PATCH] Save TARGET_CC version in modinfo.sh. Suggested by: Andrey Borzenkov. --- ChangeLog | 6 ++++++ configure.ac | 3 +++ grub-core/modinfo.sh.in | 1 + 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index d08793254..65e8a1e03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-12-24 Vladimir Serbinenko + + Save TARGET_CC version in modinfo.sh. + + Suggested by: Andrey Borzenkov. + 2013-12-24 Vladimir Serbinenko Make grub_util_devmapper_part_to_disk and grub_util_find_partition_start diff --git a/configure.ac b/configure.ac index 77c942a29..2aa2fb3b1 100644 --- 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 d46b56c07..69d833432 100644 --- 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@'