setup_toolchain: add CMAKE_SYSTEM_PROCESSOR to host/bootstrap config

libjpeg-turbo:host fails without this.
This commit is contained in:
MilhouseVH 2018-12-27 15:45:41 +00:00
parent 3260354e63
commit f9ed478992
2 changed files with 3 additions and 2 deletions

View File

@ -323,6 +323,7 @@ setup_toolchain() {
mkdir -p $TOOLCHAIN/etc
echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
echo "SET(CMAKE_SYSTEM_VERSION 1)" >> $CMAKE_CONF
echo "SET(CMAKE_SYSTEM_PROCESSOR ${MACHINE_HARDWARE_PLATFORM})" >> $CMAKE_CONF
echo "SET(CMAKE_C_COMPILER $CC)" >> $CMAKE_CONF
echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF

View File

@ -60,8 +60,8 @@ if [ -z "$HOST_LIBDIR" ]; then
HOST_LIBDIR="$TOOLCHAIN/lib"
# ubuntu/debian specific "multiarch support"
MACHINE_HARDWARE_NAME="$(uname -m)"
MACHINE_HARDWARE_PLATFORM="$(uname -i)"
export MACHINE_HARDWARE_NAME="$(uname -m)"
export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
FAMILY_TRIPLET=${HOST_NAME/${MACHINE_HARDWARE_NAME}/${MACHINE_HARDWARE_PLATFORM}}
if [ -d /lib/$FAMILY_TRIPLET ]; then
HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"