From efd827ebbb8d20f6d6233acbaefe22983f800390 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 14 Jan 2015 10:50:48 +0100 Subject: [PATCH] build_style/cmake: set LIBDIR to lib32 on x86. --- common/build_style/cmake.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/common/build_style/cmake.sh b/common/build_style/cmake.sh index db9ee07fa28..18f9657c4f8 100644 --- a/common/build_style/cmake.sh +++ b/common/build_style/cmake.sh @@ -23,7 +23,14 @@ _EOF configure_args+=" -DCMAKE_TOOLCHAIN_FILE=cross_${XBPS_CROSS_TRIPLET}.cmake" fi configure_args+=" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release" - configure_args+=" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_SBINDIR=sbin" + + if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then + configure_args+=" -DCMAKE_INSTALL_LIBDIR=lib32" + else + configure_args+=" -DCMAKE_INSTALL_LIBDIR=lib" + fi + + configure_args+=" -DCMAKE_INSTALL_SBINDIR=sbin" cmake ${configure_args} .. }