From b6327e0fab4b0135b8377719856a7322b59165ef Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Sun, 24 Feb 2019 20:12:27 +0900 Subject: [PATCH] [Build][GCC] Fix FTBFS without setting LTO_THREADS value and selecting USE_LTO. --- source/build-cmake/params/buildvars_linux_params_gcc.dat | 12 ++++++++++-- source/build-cmake/params/buildvars_mingw_params_gcc.dat | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/source/build-cmake/params/buildvars_linux_params_gcc.dat b/source/build-cmake/params/buildvars_linux_params_gcc.dat index 0175d120f..4e90dedac 100644 --- a/source/build-cmake/params/buildvars_linux_params_gcc.dat +++ b/source/build-cmake/params/buildvars_linux_params_gcc.dat @@ -134,10 +134,18 @@ case ${CSP_DEBUG} in ;; esac +if [ -n "${LTO_THREADS}" ] ; then + LTO_FLAGS="-flto=${LTO_THREADS} -flto-compression-level=9 ${LTO_FLAGS}" + LTO_FLAGS2="-flto -ffat-lto-objects" +else + LTO_FLAGS="" + LTO_FLAGS2="" +fi + case ${USE_LTO} in "Yes" | "yes" | "YES" ) - MAKEFLAGS_LINK_BASE2="-flto=${LTO_THREADS} -flto-compression-level=9 ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" - MAKEFLAGS_BASE2="-flto -flto-compression-level=9 ${MAKEFLAGS_BASE2}" + MAKEFLAGS_LINK_BASE2="${LTO_FLAGS} ${MAKEFLAGS_BASE2}" + MAKEFLAGS_BASE2="${LTO_FLAGS2} ${MAKEFLAGS_BASE2}" ;; "No" | "no" | "NO" | * ) MAKEFLAGS_LINK_BASE2="${MAKEFLAGS_BASE2}" diff --git a/source/build-cmake/params/buildvars_mingw_params_gcc.dat b/source/build-cmake/params/buildvars_mingw_params_gcc.dat index e27b13a5d..bb21dbd2b 100644 --- a/source/build-cmake/params/buildvars_mingw_params_gcc.dat +++ b/source/build-cmake/params/buildvars_mingw_params_gcc.dat @@ -86,10 +86,17 @@ case ${USE_STACK_PROTECTION} in ;; esac +if [ -n "${LTO_THREADS}" ] ; then + LTO_FLAGS="-flto=${LTO_THREADS} -flto-compression-level=9 ${LTO_FLAGS}" + LTO_FLAGS2="-flto -ffat-lto-objects" +else + LTO_FLAGS="" + LTO_FLAGS2="" +fi case ${USE_LTO} in "Yes" | "yes" | "YES" ) - MAKEFLAGS_LINK_BASE="-flto=${LTO_THREADS} ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" - MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}" + MAKEFLAGS_LINK_BASE="${LTO_FLAGS} ${MAKEFLAGS_BASE2}" + MAKEFLAGS_BASE2="${LTO_FLAGS2} ${MAKEFLAGS_BASE2}" ;; "No" | "no" | "NO" | * ) MAKEFLAGS_LINK_BASE="${MAKEFLAGS_BASE2}" -- 2.11.0