Always use -Oz optimization level

This commit is contained in:
Fredrik Fornwall 2019-07-14 20:03:07 +02:00
parent 5d4019357c
commit 51c97e3bb5
3 changed files with 2 additions and 13 deletions

View File

@ -23,7 +23,6 @@ termux_step_pre_configure() {
if [ "$TERMUX_ARCH_BITS" = 32 ]; then if [ "$TERMUX_ARCH_BITS" = 32 ]; then
# process.c:function timetick2integer: error: undefined reference to '__mulodi4' # process.c:function timetick2integer: error: undefined reference to '__mulodi4'
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" rb_cv_builtin___builtin_mul_overflow=no" TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" rb_cv_builtin___builtin_mul_overflow=no"
CFLAGS="${CFLAGS/-Os/-Oz}"
fi fi
} }

View File

@ -2,13 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.tarsnap.com/scrypt.html
TERMUX_PKG_DESCRIPTION="scrypt KDF library and file encryption tool" TERMUX_PKG_DESCRIPTION="scrypt KDF library and file encryption tool"
TERMUX_PKG_LICENSE="BSD 2-Clause" TERMUX_PKG_LICENSE="BSD 2-Clause"
TERMUX_PKG_VERSION=1.2.1 TERMUX_PKG_VERSION=1.2.1
TERMUX_PKG_REVISION=2 TERMUX_PKG_REVISION=3
TERMUX_PKG_SRCURL=https://www.tarsnap.com/scrypt/scrypt-1.2.1.tgz TERMUX_PKG_SRCURL=https://www.tarsnap.com/scrypt/scrypt-1.2.1.tgz
TERMUX_PKG_SHA256=4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577 TERMUX_PKG_SHA256=4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577
TERMUX_PKG_DEPENDS="openssl" TERMUX_PKG_DEPENDS="openssl"
termux_step_pre_configure() {
# Work around miscompilation on at least aarch64 with -Oz,
# see https://github.com/termux/termux-packages/issues/3260:
export CFLAGS=${CFLAGS/-Oz/-Os}
}

View File

@ -46,13 +46,9 @@ termux_step_setup_toolchain() {
if [ -n "$TERMUX_DEBUG" ]; then if [ -n "$TERMUX_DEBUG" ]; then
CFLAGS+=" -g3 -O1 -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" CFLAGS+=" -g3 -O1 -fstack-protector --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
else
if [ $TERMUX_ARCH = arm ]; then
CFLAGS+=" -Os"
else else
CFLAGS+=" -Oz" CFLAGS+=" -Oz"
fi fi
fi
export CXXFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS"
export CPPFLAGS="-I${TERMUX_PREFIX}/include" export CPPFLAGS="-I${TERMUX_PREFIX}/include"