Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset CFLAGS and CXXFLAGS to a previous value to fix the large release builds. #264

Draft
wants to merge 1 commit into
base: 2.4
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,6 @@ fi
if test x$enable_debug = xyes ; then
CONF_CFLAGS="$CONF_CFLAGS -Werror -g -O0"
CONF_CXXFLAGS="$CONF_CXXFLAGS -Werror -g -O0"
# revert automatic setting of CFLAGS and CXXFLAGS to prevent
# override of "-g -O0" put into CONF_CFLAGS and CONF_CXXFLAGS above
CFLAGS="$user_CFLAGS"
CXXFLAGS="$user_CXXFLAGS"
AC_DEFINE(DEBUG, 1, [Debugging enabled])
else
if test "$GCC" = yes ; then
Expand All @@ -812,9 +808,17 @@ else
;;
esac
fi
CONF_CFLAGS="$CONF_CFLAGS -O2"
CONF_CXXFLAGS="$CONF_CXXFLAGS -O2"
AC_DEFINE(NDEBUG, 1, [Debugging disabled])
fi

# revert automatic setting of CFLAGS and CXXFLAGS to prevent
# override of debug or optimization settings in CONF_CFLAGS
# and CONF_CXXFLAGS above
CFLAGS="$user_CFLAGS"
CXXFLAGS="$user_CXXFLAGS"

dnl check for -search_paths_first linker flag when making dynamic libraries
search_paths_first_flag="-Wl,-search_paths_first -mdynamic-no-pic"
AC_MSG_CHECKING([if the compiler understands $search_paths_first_flag])
Expand Down