Commit 4a78361e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Do not force -O0 with --disable-optimizations

GCC takes the last -O* option, which defaults to -O0 anyway. With
./configure forcing -O0, there was no way to select a custom
optimization level via external CFLAGS.
parent c89257fa
...@@ -1083,14 +1083,6 @@ else ...@@ -1083,14 +1083,6 @@ else
fi fi
fi fi
AC_CACHE_CHECK([if \$CC accepts -O0],
[ac_cv_c_o0],
[CFLAGS="${CFLAGS_save} -O0"
AC_TRY_COMPILE([],,ac_cv_c_o0=yes, ac_cv_c_o0=no)])
if test "${ac_cv_c_o0}" != "no"; then
CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O0"
fi
dnl Check for -ffast-math dnl Check for -ffast-math
AC_CACHE_CHECK([if \$CC accepts -ffast-math], AC_CACHE_CHECK([if \$CC accepts -ffast-math],
[ac_cv_c_fast_math], [ac_cv_c_fast_math],
......
...@@ -101,7 +101,6 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [ ...@@ -101,7 +101,6 @@ AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
-e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \ -e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \
-e "s/@CFLAGS_OPTIM_SPEED@/${CFLAGS_OPTIM_SPEED}/" \ -e "s/@CFLAGS_OPTIM_SPEED@/${CFLAGS_OPTIM_SPEED}/" \
-e "s/@CFLAGS_OPTIM_NODEBUG@/${CFLAGS_OPTIM_NODEBUG}/" \ -e "s/@CFLAGS_OPTIM_NODEBUG@/${CFLAGS_OPTIM_NODEBUG}/" \
-e "s/@CFLAGS_NOOPTIM@/${CFLAGS_NOOPTIM}/" \
> vlc-config.in > vlc-config.in
dnl Switch/case loop dnl Switch/case loop
......
...@@ -23,7 +23,6 @@ libs="" ...@@ -23,7 +23,6 @@ libs=""
cflags_tuning="@CFLAGS_TUNING@" cflags_tuning="@CFLAGS_TUNING@"
cflags_optim_speed="@CFLAGS_OPTIM_SPEED@" cflags_optim_speed="@CFLAGS_OPTIM_SPEED@"
cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@" cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@"
cflags_nooptim="@CFLAGS_NOOPTIM@"
# #
# Do not touch below this place unless you really know what you are doing # Do not touch below this place unless you really know what you are doing
...@@ -93,10 +92,6 @@ if [ "${optim}" = speed ]; then ...@@ -93,10 +92,6 @@ if [ "${optim}" = speed ]; then
cxxflags="${cxxflags} ${cflags_optim_nodebug}" cxxflags="${cxxflags} ${cflags_optim_nodebug}"
objcflags="${objcflags} ${cflags_optim_nodebug}" objcflags="${objcflags} ${cflags_optim_nodebug}"
fi fi
else
cflags="${cflags} ${cflags_nooptim}"
cxxflags="${cxxflags} ${cflags_nooptim}"
objcflags="${objcflags} ${cflags_nooptim}"
fi fi
# #
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment