From d59849b2e7ec7fda95bd8923e57683acf1382325 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 7 Nov 2013 19:33:54 +0100 Subject: [PATCH] * grub-core/Makefile.am: Do not include libgcc.h when compiling with clang. --- ChangeLog | 5 +++++ configure.ac | 1 + grub-core/Makefile.am | 2 ++ 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index ad3fce421..4a19338f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-11-07 Vladimir Serbinenko + + * grub-core/Makefile.am: Do not include libgcc.h when compiling with + clang. + 2013-11-07 Vladimir Serbinenko * grub-core/kern/powerpc/dl.c: Add missing pragma to silence cast-align diff --git a/configure.ac b/configure.ac index a2b5ce9ec..a399aaee7 100644 --- 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 6a987442d..ea11716e6 100644 --- 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