Browse Source

Alternative way to skip LTO

Signed-off-by: falkTX <falktx@falktx.com>
pull/25/head
falkTX 3 years ago
parent
commit
6edcee1939
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 7 additions and 18 deletions
  1. +2
    -2
      bootstrap-carla.sh
  2. +0
    -15
      bootstrap-jack2.sh
  3. +5
    -1
      setup/env.sh

+ 2
- 2
bootstrap-carla.sh View File

@@ -192,7 +192,7 @@ function build_pyqt() {
# file/magic (posix only) # file/magic (posix only)


if [ "${WIN32}" -eq 0 ]; then if [ "${WIN32}" -eq 0 ]; then
download file "${FILE_VERSION}" "ftp://ftp.astron.com/pub/file"
download file "${FILE_VERSION}" "${FILE_URL}"
build_autoconf file "${FILE_VERSION}" build_autoconf file "${FILE_VERSION}"
fi fi


@@ -200,7 +200,7 @@ fi
# libffi (for python, not needed in macOS) # libffi (for python, not needed in macOS)


if [ "${MACOS}" -eq 0 ]; then if [ "${MACOS}" -eq 0 ]; then
download libffi "${LIBFFI_VERSION}" "https://sourceware.org/pub/libffi"
download libffi "${LIBFFI_VERSION}" "${LIBFFI_URL}"
build_autoconf libffi "${LIBFFI_VERSION}" build_autoconf libffi "${LIBFFI_VERSION}"
fi fi




+ 0
- 15
bootstrap-jack2.sh View File

@@ -72,11 +72,6 @@ function build_custom_db() {
extraconfrules+=" --enable-mingw" extraconfrules+=" --enable-mingw"
fi fi


# TODO jack2 cannot be built with LTO right now
export EXTRA_CFLAGS="-fno-lto"
export EXTRA_CXXFLAGS="-fno-lto"
export EXTRA_LDFLAGS="-fno-lto"

_prebuild "${name}" "${pkgdir}" _prebuild "${name}" "${pkgdir}"


if [ ! -f "${pkgdir}/.stamp_configured" ]; then if [ ! -f "${pkgdir}/.stamp_configured" ]; then
@@ -148,11 +143,6 @@ fi
# tre (win32 only) # tre (win32 only)


if [ "${WIN32}" -eq 1 ]; then if [ "${WIN32}" -eq 1 ]; then
# TODO jack2 cannot be built with LTO right now
export EXTRA_CFLAGS="-fno-lto"
export EXTRA_CXXFLAGS="-fno-lto"
export EXTRA_LDFLAGS="-fno-lto"

download tre "${TRE_VERSION}" "${TRE_URL}" "" "git" download tre "${TRE_VERSION}" "${TRE_URL}" "" "git"
build_autoconfgen tre "${TRE_VERSION}" "--disable-nls" build_autoconfgen tre "${TRE_VERSION}" "--disable-nls"
fi fi
@@ -169,11 +159,6 @@ if [ "${WIN64}" -eq 1 ]; then
PAWPAW_PREFIX="${PAWPAW_DIR}/targets/win64" PAWPAW_PREFIX="${PAWPAW_DIR}/targets/win64"
source setup/functions.sh source setup/functions.sh


# TODO jack2 cannot be built with LTO right now
export EXTRA_CFLAGS="-fno-lto"
export EXTRA_CXXFLAGS="-fno-lto"
export EXTRA_LDFLAGS="-fno-lto"

copy_download tre tre-x32 "${TRE_VERSION}" copy_download tre tre-x32 "${TRE_VERSION}"
build_autoconfgen tre-x32 "${TRE_VERSION}" "--disable-nls --libdir=${PAWPAW_PREFIX}/lib32" build_autoconfgen tre-x32 "${TRE_VERSION}" "--disable-nls --libdir=${PAWPAW_PREFIX}/lib32"




+ 5
- 1
setup/env.sh View File

@@ -53,10 +53,14 @@ PAWPAW_TMPDIR="/tmp"
## build flags ## build flags


BUILD_FLAGS="-O2 -pipe -I${PAWPAW_PREFIX}/include ${EXTRA_FLAGS}" BUILD_FLAGS="-O2 -pipe -I${PAWPAW_PREFIX}/include ${EXTRA_FLAGS}"
BUILD_FLAGS+=" -ffast-math -fno-strict-aliasing -flto"
BUILD_FLAGS+=" -ffast-math"
BUILD_FLAGS+=" -fPIC -DPIC -DNDEBUG -D_FORTIFY_SOURCE=2" BUILD_FLAGS+=" -fPIC -DPIC -DNDEBUG -D_FORTIFY_SOURCE=2"
BUILD_FLAGS+=" -fdata-sections -ffunction-sections -fno-common -fstack-protector -fvisibility=hidden" BUILD_FLAGS+=" -fdata-sections -ffunction-sections -fno-common -fstack-protector -fvisibility=hidden"


if [ "${PAWPAW_SKIP_LTO}" -eq 1 ]; then
BUILD_FLAGS+=" -fno-strict-aliasing -flto"
fi

if [ "${TOOLCHAIN_PREFIX}" = "arm-linux-gnueabihf" ]; then if [ "${TOOLCHAIN_PREFIX}" = "arm-linux-gnueabihf" ]; then
BUILD_FLAGS+=" -mfpu=neon-vfpv4 -mfloat-abi=hard" BUILD_FLAGS+=" -mfpu=neon-vfpv4 -mfloat-abi=hard"
elif [ "${TOOLCHAIN_PREFIX}" != "aarch64-linux-gnu" ]; then elif [ "${TOOLCHAIN_PREFIX}" != "aarch64-linux-gnu" ]; then


Loading…
Cancel
Save