summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-24 11:15:30 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-24 11:15:30 +0000
commit5f34c7b2aa07724cd62b1d71c2bed525ac0f7869 (patch)
treede0b5a045b7846972a1f4e626e974728f656f04a
parente875bd35c605b84d366d12f0c4ff2d1ce98be3b5 (diff)
downloadmpv-5f34c7b2aa07724cd62b1d71c2bed525ac0f7869.tar.bz2
mpv-5f34c7b2aa07724cd62b1d71c2bed525ac0f7869.tar.xz
Check for -mno-omit-leaf-frame-pointer (compilation fix for icc 10.1.012).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26080 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure2
-rw-r--r--loader/Makefile2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index b2ef48519b..8929ec1b19 100755
--- a/configure
+++ b/configure
@@ -7592,6 +7592,7 @@ if test "$cc_vendor" = "gnu" ; then
cc_check -Wdisabled-optimization && CFLAGS="-Wdisabled-optimization $CFLAGS"
fi
+cc_check -mno-omit-leaf-frame-pointer && CFLAG_NO_OMIT_LEAF_FRAME_POINTER="-mno-omit-leaf-frame-pointer"
#this must be the last test to be performed or the ones following it will likely fail
#because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer
@@ -7650,6 +7651,7 @@ INSTALL = $_install
EXTRA_INC = $_inc_extra
EXTRAXX_INC = $_inc_extra $_inc_extraxx
OPTFLAGS = $CFLAGS \$(EXTRA_INC)
+CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER
CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)
CFLAG_STACKREALIGN = $_stackrealign
INSTALLSTRIP = $_install_strip
diff --git a/loader/Makefile b/loader/Makefile
index b76849ad6f..c413ffd3b9 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -33,7 +33,7 @@ SRCS_COMMON += dshow/DS_AudioDecoder.c \
include ../mpcommon.mak
-CFLAGS+=-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
+CFLAGS+=-fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER)
TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a
TEST_LDFLAGS = -ltermcap -ldl -lm -lpthread -g