diff options
| author | Eduardo Chappa <chappa@washington.edu> | 2021-10-04 22:00:14 -0600 |
|---|---|---|
| committer | Eduardo Chappa <chappa@washington.edu> | 2021-10-04 22:00:14 -0600 |
| commit | 52d9d31265899fc6805dceb0f64cdd03b06995a8 (patch) | |
| tree | 37ecf40fe8aa60893583bcda870cd66a0ec562e8 | |
| parent | 76da583d4aa4600148048c4cb025d9248d41326c (diff) | |
| download | alpine-52d9d31265899fc6805dceb0f64cdd03b06995a8.tar.xz | |
* the option --disable-optimization to the configure script does not
eliminate optimization if it comes from the CFLAGS variable. This
commit fixes that.
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -15185,7 +15185,8 @@ if test x$enable_optimization != "xno" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - C_FLAGS="`echo $AM_CFLAGS | ${SED} 's/-O2//'`" + CFLAGS="`echo $CFLAGS | ${SED} 's/-O2//g'`" + C_FLAGS="`echo $AM_CFLAGS | ${SED} 's/-O2//g'`" CFLAGS="$CFLAGS $C_FLAGS" alpine_c_client_gccoptlevel="-O0" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 diff --git a/configure.ac b/configure.ac index 554c735e..9549ddb6 100644 --- a/configure.ac +++ b/configure.ac @@ -243,7 +243,8 @@ AC_ARG_ENABLE(optimization, AS_HELP_STRING([--disable-optimization],[Exclude opt if test x$enable_optimization != "xno" ; then AC_MSG_RESULT([yes]) else - C_FLAGS="`echo $AM_CFLAGS | ${SED} 's/-O2//'`" + CFLAGS="`echo $CFLAGS | ${SED} 's/-O2//g'`" + C_FLAGS="`echo $AM_CFLAGS | ${SED} 's/-O2//g'`" CFLAGS="$CFLAGS $C_FLAGS" alpine_c_client_gccoptlevel="-O0" AC_MSG_RESULT([no]) diff --git a/pith/pine.hlp b/pith/pine.hlp index 126a776a..00727f40 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 597 2021-10-03 21:12:53 +Alpine Commit 598 2021-10-04 22:00:11 ============= h_news ================= <HTML> <HEAD> |