Commit c6fdadcb authored by Christophe Massiot's avatar Christophe Massiot
Browse files

Keep -O2 in --disable-optimizations mode, cause it can't harm...

parent 8d186b97
...@@ -117,6 +117,9 @@ CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@ ...@@ -117,6 +117,9 @@ CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@
endif endif
endif endif
endif endif
else
# !OPTIM
CFLAGS_optim = @CFLAGS_NOOPTIM@
endif endif
CPPFLAGS_default += $(CPPFLAGS_release) \ CPPFLAGS_default += $(CPPFLAGS_release) \
......
...@@ -586,21 +586,27 @@ AC_CACHE_CHECK([if \$CC accepts -O3], ...@@ -586,21 +586,27 @@ AC_CACHE_CHECK([if \$CC accepts -O3],
AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
if test "x${ac_cv_c_o3}" != "xno"; then if test "x${ac_cv_c_o3}" != "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
else fi
AC_CACHE_CHECK([if \$CC accepts -O2],
[ac_cv_c_o2], AC_CACHE_CHECK([if \$CC accepts -O2],
[CFLAGS="${CFLAGS_save} -O2" [ac_cv_c_o2],
AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) [CFLAGS="${CFLAGS_save} -O2"
if test "x${ac_cv_c_o2}" != "xno"; then AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
if test "x${ac_cv_c_o2}" != "xno"; then
if test "x${ac_cv_c_o3}" = "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
else fi
AC_CACHE_CHECK([if \$CC accepts -O], CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
[ac_cv_c_o], else
[CFLAGS="${CFLAGS_save} -O" AC_CACHE_CHECK([if \$CC accepts -O],
AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) [ac_cv_c_o],
if test "x${ac_cv_c_o}" != "xno"; then [CFLAGS="${CFLAGS_save} -O"
AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
if test "x${ac_cv_c_o}" != "xno"; then
if test "x${ac_cv_c_o3}" = "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
fi fi
CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O"
fi fi
fi fi
...@@ -2863,6 +2869,7 @@ AC_SUBST(INCLUDES) ...@@ -2863,6 +2869,7 @@ AC_SUBST(INCLUDES)
AC_SUBST(CFLAGS_TUNING) AC_SUBST(CFLAGS_TUNING)
AC_SUBST(CFLAGS_OPTIM) AC_SUBST(CFLAGS_OPTIM)
AC_SUBST(CFLAGS_OPTIM_NODEBUG) AC_SUBST(CFLAGS_OPTIM_NODEBUG)
AC_SUBST(CFLAGS_NOOPTIM)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS_vlc) AC_SUBST(CFLAGS_vlc)
......
Markdown is supported
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