aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-09-21 11:23:37 +0200
committerBjörn Gustavsson <[email protected]>2011-09-21 11:23:37 +0200
commite58fa57a4936ad16e81ed05441fc5c85fabafb5d (patch)
treef77b99a6c433564add6b58d8489ee88200ffa9cb /erts
parentec36499d7e329b4dc69a1a3be3422eac7907c260 (diff)
parent0cc4d4d12020310c98f9583e612074e26821163c (diff)
downloadotp-e58fa57a4936ad16e81ed05441fc5c85fabafb5d.tar.gz
otp-e58fa57a4936ad16e81ed05441fc5c85fabafb5d.tar.bz2
otp-e58fa57a4936ad16e81ed05441fc5c85fabafb5d.zip
Merge branch 'dev' into major
* dev: erl_bif_types: Fix types for lists:key{search,find,member}/3 Fix build problems on MacOS 10.7 (Lion)
Diffstat (limited to 'erts')
-rw-r--r--erts/aclocal.m45
-rw-r--r--erts/emulator/Makefile.in10
2 files changed, 9 insertions, 6 deletions
diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
index 5daaa0ae5b..27f643921e 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 1ecda6bfa2..6cd9be5680 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -600,11 +600,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 $@
@@ -618,6 +613,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