* grub-core/Makefile.am: Do not include libgcc.h when compiling with

	clang.

diff --git a/ChangeLog b/ChangeLog
index ad3fce4211d45b60c46072b8d6e62f519cfb60c9..4a19338f22f2a43f32dc75b340afdb156322ae8d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/Makefile.am: Do not include libgcc.h when compiling with
+       clang.
+
 2013-11-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/powerpc/dl.c: Add missing pragma to silence cast-align

diff --git a/configure.ac b/configure.ac
index a2b5ce9ecaf445c6036820617d9d1f4d09604395..a399aaee7ae6859569a1ab8d7507b0733971360f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1371,6 +1371,7 @@ AC_SUBST(BUILD_LIBM)
 #
 
 AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
+AM_CONDITIONAL([COND_clang], [test x$grub_cv_cc_target_clang = xyes])
 AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
 AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
 AM_CONDITIONAL([COND_ia64_efi], [test x$target_cpu = xia64 -a x$platform = xefi])

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 6a987442d919f5f65c752eee406b7a56dc19befd..ea11716e6a154bad5aa06961e44e5b8295f323e3 100644 (file)
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -82,7 +82,9 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+if !COND_clang
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+endif
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h
 
 if COND_i386_pc