From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Sun, 2 Oct 2016 16:48:07 +0000 (+0900)
Subject: [Build][Linux] Fix wrong flags with LTO.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bd897115fad872c79390cc9dc156de949334a0dc;p=csp-qt%2Fcommon_source_project-fm7.git

[Build][Linux] Fix wrong flags with LTO.
---

diff --git a/source/build-cmake/buildvars.dat b/source/build-cmake/buildvars.dat
index ca557da14..a5a35a693 100644
--- a/source/build-cmake/buildvars.dat
+++ b/source/build-cmake/buildvars.dat
@@ -8,7 +8,7 @@ BUILD_TYPE="Relwithdebinfo"
 CSP_DEBUG="No"
 # "No" or "Yes".
 USE_LTO="Yes"
-# No" or "Yes"
+# "No" or "Yes"
 STRIP_SYMBOLS="No"
 
 ADDITIONAL_MAKEFLAGS_LINK_EXE=""
@@ -20,7 +20,7 @@ QT5_DIR="/opt/Qt5.3.2/5.3/gcc_64"
 LIB_INSTALL="/usr/local/lib/x86_64-linux-gnu/"
 
 MAKEFLAGS_GENERAL="-j6"
-MAKEFLAGS_BASE=""
+#MAKEFLAGS_BASE=""
 CMAKE_APPENDFLAG="${CMAKE_APPENDFLAG} -DUSE_MOVIE_SAVER=ON -DUSE_MOVIE_LOADER=ON"
 
 
diff --git a/source/build-cmake/config_build.sh b/source/build-cmake/config_build.sh
index 3fee231a9..f624a6f42 100755
--- a/source/build-cmake/config_build.sh
+++ b/source/build-cmake/config_build.sh
@@ -73,7 +73,6 @@ function build_dll() {
 	     ${CMAKE_FLAGS1} \
 	     "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
 	     "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
-	     "-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_DLL_LINK_BASE}" \
 	     ${CMAKE_APPENDFLAG} \
 	     .. | tee make.log
     
@@ -83,7 +82,6 @@ function build_dll() {
 	     ${CMAKE_FLAGS1} \
 	     "${CMAKE_FLAGS2}=${MAKEFLAGS_LIB_CXX}" \
 	     "${CMAKE_FLAGS3}=${MAKEFLAGS_LIB_CC}" \
-	     "-DCMAKE_SHARED_LINKER_FLAGS:STRING=${CMAKE_DLL_LINK_BASE}" \
 	     ${CMAKE_APPENDFLAG} \
 	     .. | tee -a make.log
     
@@ -143,7 +141,7 @@ for SRCDATA in $@ ; do\
 	     "${CMAKE_FLAGS2}=${MAKEFLAGS_CXX}" \
 	     "${CMAKE_FLAGS3}=${MAKEFLAGS_CC}" \
 	     ${CMAKE_APPENDFLAG} \
-	     "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_LINK_BASE}" \
+	     "-DCMAKE_EXE_LINKER_FLAGS:STRING=${MAKEFLAGS_LINK_BASE}" \
 	     .. | tee make.log
 
     ${CMAKE} -D CMAKE_C_COMPILER:STRING=${CCMAKE_CC}  \
@@ -152,7 +150,7 @@ for SRCDATA in $@ ; do\
 	     "${CMAKE_FLAGS2}=${MAKEFLAGS_CXX}" \
 	     "${CMAKE_FLAGS3}=${MAKEFLAGS_CC}" \
 	     ${CMAKE_APPENDFLAG} \
-	     "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_LINK_BASE}" \
+	     "-DCMAKE_EXE_LINKER_FLAGS:STRING=${MAKEFLAGS_LINK_BASE}" \
 	     .. | tee -a make.log
 
     make clean
diff --git a/source/build-cmake/params/buildvars_linux_params_gcc.dat b/source/build-cmake/params/buildvars_linux_params_gcc.dat
index 0a8a3ad73..4c2717b02 100644
--- a/source/build-cmake/params/buildvars_linux_params_gcc.dat
+++ b/source/build-cmake/params/buildvars_linux_params_gcc.dat
@@ -28,11 +28,12 @@ case ${CSP_DEBUG} in
 esac
 case ${USE_LTO} in
    "Yes" | "yes" | "YES" )
-       MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}"
        MAKEFLAGS_LINK_BASE2="-flto=6 -fwhole-program ${MAKEFLAGS_BASE2}"
+       MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}"
        ;;
    "No" | "no" | "NO" | * )
        MAKEFLAGS_LINK_BASE2="${MAKEFLAGS_BASE2}"
+       MAKEFLAGS_BASE2="${MAKEFLAGS_BASE2}"
        ;;
 esac