diff options
| author | Björn Gustavsson <[email protected]> | 2011-11-30 10:44:42 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-11-30 10:44:42 +0100 |
| commit | f7c881208154dcae6d0b753a160eb771710bd47a (patch) | |
| tree | 14f19e6524a33f5e2d664e162ecf0d3b21d0d959 /erts/aclocal.m4 | |
| parent | 8e5ef86ee21cb6491287710606a7525f45cc50fc (diff) | |
| parent | 3c36d2c5f75827f098a691dfcf534ab3b95d7bd9 (diff) | |
| download | otp-f7c881208154dcae6d0b753a160eb771710bd47a.tar.gz otp-f7c881208154dcae6d0b753a160eb771710bd47a.tar.bz2 otp-f7c881208154dcae6d0b753a160eb771710bd47a.zip | |
Merge branch 'bjorn/llvm-issues/OTP-9712'
* bjorn/llvm-issues/OTP-9712:
INSTALL.md: Update build instructions for Lion
Fix clang linking problem
configure: Define NO_JUMP_TABLE if all we have is llvm-gcc
beam_emu.c: Eliminate warnings when NO_JUMP_TABLE is defined
beam_emu.c: Use the correct void* type for computed gotos
MacOS X: Completely remove obsolete -no-cpp-precomp option
Diffstat (limited to 'erts/aclocal.m4')
| -rw-r--r-- | erts/aclocal.m4 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index bd228a2d1f..ea5cc67fbe 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -125,8 +125,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; @@ -168,6 +170,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(); |