From e1d960cb615a86faae67c16dc2d185b367f1c385 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Fri, 25 Nov 2011 15:22:34 +0100 Subject: Fix aclocal.m4 to override changes in opu --- aclocal.m4 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'aclocal.m4') diff --git a/aclocal.m4 b/aclocal.m4 index a7a8ceb99a..34237fcb43 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -213,8 +213,10 @@ AC_DEFUN(LM_FIND_EMU_CC, ac_cv_prog_emu_cc, [ AC_TRY_COMPILE([],[ -#ifdef __llvm__ -#error "llvm is currently unable to compile beam_emu.c" +#if defined(__clang_major__) && __clang_major__ >= 3 + /* clang 3.x or later is fine */ +#elif defined(__llvm__) +#error "this version of llvm is unable to correctly compile beam_emu.c" #endif __label__ lbl1; __label__ lbl2; @@ -256,6 +258,11 @@ if test $ac_cv_prog_emu_cc != no; then CFLAGS="" CPPFLAGS="" AC_TRY_COMPILE([],[ +#if defined(__clang_major__) && __clang_major__ >= 3 + /* clang 3.x or later is fine */ +#elif defined(__llvm__) +#error "this version of llvm is unable to correctly compile beam_emu.c" +#endif __label__ lbl1; __label__ lbl2; int x = magic(); -- cgit v1.2.1