Merge pull request #778 from lrusak/cmake-fixups

scripts/build: use debug option for target instead of host
This commit is contained in:
MilhouseVH 2016-09-29 20:24:41 +01:00 committed by GitHub
commit a604b4ad01

View File

@ -125,9 +125,15 @@ if [ ! -f $STAMP ]; then
--disable-static \
--enable-shared"
if [ "$DEBUG" = "yes" ]; then
CMAKE_BUILD_TYPE="Debug"
else
CMAKE_BUILD_TYPE="Release"
fi
TARGET_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release"
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"
# configure HOST build defaults
HOST_CONFIGURE_OPTS="--host=$HOST_NAME \
@ -141,15 +147,9 @@ if [ ! -f $STAMP ]; then
--disable-static \
--enable-shared"
if [ "$DEBUG" = "yes" ]; then
CMAKE_BUILD_TYPE="Debug"
else
CMAKE_BUILD_TYPE="Release"
fi
HOST_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE"
-DCMAKE_BUILD_TYPE=Release"
# configure INIT build defaults
INIT_CONFIGURE_OPTS="$TARGET_CONFIGURE_OPTS"