From 22020637d7a59dbc983f3e2751f71acf19891802 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Sat, 12 Dec 2020 02:47:24 +0100 Subject: ci-build.sh: Move install_prefix to cmake place where it is used --- tools/ci-build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/ci-build.sh b/tools/ci-build.sh index a7d79b1..366a407 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -11,8 +11,6 @@ set -x # target to build for : "${ci_target:=${CROSS_COMPILE%-}}" -install_prefix=$(${ci_target}-gcc --print-sysroot)/${ci_target} - case "$ci_buildsys" in (Makefile) ./configure --enable-shared --enable-static --enable-wine --cross-prefix=${ci_target}- @@ -27,7 +25,7 @@ case "$ci_buildsys" in cd build cmake \ --no-warn-unused-cli \ - -DCMAKE_FIND_ROOT_PATH=$install_prefix \ + -DCMAKE_FIND_ROOT_PATH=$(${ci_target}-gcc --print-sysroot)/${ci_target} \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_C_COMPILER=$(which ${ci_target}-gcc) \ -DCMAKE_SYSTEM_PROCESSOR=${ci_target%-*-*} \ -- cgit v1.2.3-55-g6feb