From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Thu, 29 Sep 2016 09:05:42 +0000 (+0900)
Subject: [BUILD] Fix Linux/GCC.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1b2f044dc532d1e2534be10080493f043c8e4479;p=csp-qt%2Fcommon_source_project-fm7.git

[BUILD] Fix Linux/GCC.
---

diff --git a/source/build-cmake/buildvars.dat b/source/build-cmake/buildvars.dat
index e4c7f4c9f..ca557da14 100644
--- a/source/build-cmake/buildvars.dat
+++ b/source/build-cmake/buildvars.dat
@@ -1,13 +1,13 @@
 ###
 #
-BUILD_TOOLCHAIN="LLVM"
+#BUILD_TOOLCHAIN="LLVM"
+BUILD_TOOLCHAIN="GCC"
 
 BUILD_TYPE="Relwithdebinfo"
 # "No" or "Yes".
-CSP_DEBUG="Yes"
+CSP_DEBUG="No"
 # "No" or "Yes".
 USE_LTO="Yes"
-
 # No" or "Yes"
 STRIP_SYMBOLS="No"
 
diff --git a/source/build-cmake/config_build.sh b/source/build-cmake/config_build.sh
index 8e11b3305..3fee231a9 100755
--- a/source/build-cmake/config_build.sh
+++ b/source/build-cmake/config_build.sh
@@ -28,16 +28,6 @@ case ${BUILD_TOOLCHAIN} in
 	  echo "ASSUME GCC"
 	  ;;
 esac   
-case ${USE_LTO} in
-   "Yes" | "yes" | "YES" )
-     MAKEFLAGS_BASE2="-flto ${MAKEFLAGS_BASE2}"
-     MAKEFLAGS_LINK_BASE2="-flto -O3 ${MAKEFLAGS_BASE2}"
-   ;;
-   "No" | "no" | "NO" | * )
-     MAKEFLAGS_BASE2="${MAKEFLAGS_BASE2}"
-     MAKEFLAGS_LINK_BASE2="${MAKEFLAGS_BASE2}"
-   ;;
-esac
 
 case ${STRIP_SYMBOLS} in
    "Yes" | "yes" | "YES" )
@@ -54,10 +44,10 @@ esac
 #################
 #
 #
-MAKEFLAGS_CXX="${MAKEFLAGS_CXX_BASE2}"
-MAKEFLAGS_CC="${MAKEFLAGS_CC_BASE2}"
-MAKEFLAGS_LIB_CXX="${MAKEFLAGS_CXX_BASE2}"
-MAKEFLAGS_LIB_CC="${MAKEFLAGS_CC_BASE2}"
+MAKEFLAGS_CXX="${MAKEFLAGS_BASE2}"
+MAKEFLAGS_CC="${MAKEFLAGS_BASE2}"
+MAKEFLAGS_LIB_CXX="${MAKEFLAGS_BASE2}"
+MAKEFLAGS_LIB_CC="${MAKEFLAGS_BASE2}"
 
 ###################
 #
diff --git a/source/build-cmake/params/buildvars_linux_params_gcc.dat b/source/build-cmake/params/buildvars_linux_params_gcc.dat
index 04c96b605..0a8a3ad73 100644
--- a/source/build-cmake/params/buildvars_linux_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_linux_params_gcc.dat
@@ -11,7 +11,9 @@ case ${CSP_DEBUG} in
       MAKEFLAGS_BASE2="-g -ggdb ${MAKEFLAGS_BASE} -DNDEBUG"
       ;;
    "No" | "no" | "NO" | * )
-      MAKEFLAGS_BASE2="-fvect-cost-model=dynamic -ftree-vectorize \
+      MAKEFLAGS_BASE2="-g -ggdb \
+               -O3 \
+               -fvect-cost-model=dynamic -ftree-vectorize \
                -ftree-loop-distribute-patterns \
 	       -ftree-loop-optimize -ftree-loop-if-convert-stores \
 	       -fbranch-probabilities -fbranch-target-load-optimize \
@@ -20,17 +22,17 @@ case ${CSP_DEBUG} in
 	       -fgraphite-identity \
 	       -floop-nest-optimize \
 	       -msse -msse2 \
-	       ${MAKEFLAGS_BASE} \
+               ${MAKEFLAGS_BASE} \
 	       "
 	       ;;
 esac
 case ${USE_LTO} in
    "Yes" | "yes" | "YES" )
        MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}"
-       MAKEFLAGS_LINK_BASE="-flto -ffat-lto-objects -fwhole-program ${MAKEFLAGS_BASE2}"
+       MAKEFLAGS_LINK_BASE2="-flto=6 -fwhole-program ${MAKEFLAGS_BASE2}"
        ;;
    "No" | "no" | "NO" | * )
-       MAKEFLAGS_LINK_BASE="${MAKEFLAGS_BASE2}"
+       MAKEFLAGS_LINK_BASE2="${MAKEFLAGS_BASE2}"
        ;;
 esac