OSDN Git Service

[Build][GCC] Fix FTBFS without setting LTO_THREADS value and selecting USE_LTO.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 24 Feb 2019 11:12:27 +0000 (20:12 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Sun, 24 Feb 2019 11:12:27 +0000 (20:12 +0900)
source/build-cmake/params/buildvars_linux_params_gcc.dat
source/build-cmake/params/buildvars_mingw_params_gcc.dat

index 0175d12..4e90ded 100644 (file)
@@ -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}"
index e27b13a..bb21dbd 100644 (file)
@@ -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}"