diff options
| author | Björn Gustavsson <[email protected]> | 2011-09-21 11:23:20 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-09-21 11:23:20 +0200 |
| commit | 0cc4d4d12020310c98f9583e612074e26821163c (patch) | |
| tree | 21b0787438805f313ab55adce6111b6dc653b740 | |
| parent | b5318ec588c0927dc8610451f92888646c255020 (diff) | |
| parent | dd24ca1cb76de9973220fed356540f190a05ac83 (diff) | |
| download | otp-0cc4d4d12020310c98f9583e612074e26821163c.tar.gz otp-0cc4d4d12020310c98f9583e612074e26821163c.tar.bz2 otp-0cc4d4d12020310c98f9583e612074e26821163c.zip | |
Merge branch 'bjorn/erts/support-macosx-lion/OTP-9547' into dev
* bjorn/erts/support-macosx-lion/OTP-9547:
Fix build problems on MacOS 10.7 (Lion)
| -rw-r--r-- | erts/aclocal.m4 | 5 | ||||
| -rw-r--r-- | erts/emulator/Makefile.in | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index 2bceb31983..7d9d099bba 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -125,6 +125,9 @@ 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" +#endif __label__ lbl1; __label__ lbl2; int x = magic(); @@ -140,7 +143,7 @@ lbl2: ],ac_cv_prog_emu_cc=$CC,ac_cv_prog_emu_cc=no) if test $ac_cv_prog_emu_cc = no; then - for ac_progname in emu_cc.sh gcc; do + for ac_progname in emu_cc.sh gcc-4.2 gcc; do IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_dummy="$PATH" for ac_dir in $ac_dummy; do diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index b658e79378..620402fbfb 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -598,11 +598,6 @@ INCLUDES += -I$(ERL_TOP)/erts/etc/vxworks endif ifeq ($(TARGET),win32) -# Usually the same as the default rule, but certain platforms (i.e. win32) mix -# different compilers -$(OBJDIR)/beam_emu.o: beam/beam_emu.c - $(EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ - $(OBJDIR)/dll_sys.o: sys/$(ERLANG_OSTYPE)/sys.c $(CC) $(CFLAGS) -DERL_RUN_SHARED_LIB=1 $(INCLUDES) -c $< -o $@ @@ -616,6 +611,11 @@ $(OBJDIR)/beam_emu.o: beam/beam_emu.c $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) \ -OPT:Olimit=0 -WOPT:lpre=off:spre=off:epre=off \ $(INCLUDES) -c $< -o $@ +else +# Usually the same as the default rule, but certain platforms (e.g. win32) mix +# different compilers +$(OBJDIR)/beam_emu.o: beam/beam_emu.c + $(EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ endif |