diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2020-12-12 02:47:24 +0100 |
|---|---|---|
| committer | Pali Rohár <pali.rohar@gmail.com> | 2020-12-12 02:47:24 +0100 |
| commit | 22020637d7a59dbc983f3e2751f71acf19891802 (patch) | |
| tree | c06d4054e11fd6b7ec26656ccf4c929c13f89b57 /tools | |
| parent | 3cddb7b9a1df284dfca0b41eb171e4c0b6d8f5d9 (diff) | |
| download | dlfcn-win32-22020637d7a59dbc983f3e2751f71acf19891802.tar.gz dlfcn-win32-22020637d7a59dbc983f3e2751f71acf19891802.tar.bz2 dlfcn-win32-22020637d7a59dbc983f3e2751f71acf19891802.zip | |
ci-build.sh: Move install_prefix to cmake place where it is used
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ci-build.sh | 4 |
1 files changed, 1 insertions, 3 deletions
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 | |||
| 11 | # target to build for | 11 | # target to build for |
| 12 | : "${ci_target:=${CROSS_COMPILE%-}}" | 12 | : "${ci_target:=${CROSS_COMPILE%-}}" |
| 13 | 13 | ||
| 14 | install_prefix=$(${ci_target}-gcc --print-sysroot)/${ci_target} | ||
| 15 | |||
| 16 | case "$ci_buildsys" in | 14 | case "$ci_buildsys" in |
| 17 | (Makefile) | 15 | (Makefile) |
| 18 | ./configure --enable-shared --enable-static --enable-wine --cross-prefix=${ci_target}- | 16 | ./configure --enable-shared --enable-static --enable-wine --cross-prefix=${ci_target}- |
| @@ -27,7 +25,7 @@ case "$ci_buildsys" in | |||
| 27 | cd build | 25 | cd build |
| 28 | cmake \ | 26 | cmake \ |
| 29 | --no-warn-unused-cli \ | 27 | --no-warn-unused-cli \ |
| 30 | -DCMAKE_FIND_ROOT_PATH=$install_prefix \ | 28 | -DCMAKE_FIND_ROOT_PATH=$(${ci_target}-gcc --print-sysroot)/${ci_target} \ |
| 31 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | 29 | -DCMAKE_BUILD_TYPE=RelWithDebInfo \ |
| 32 | -DCMAKE_C_COMPILER=$(which ${ci_target}-gcc) \ | 30 | -DCMAKE_C_COMPILER=$(which ${ci_target}-gcc) \ |
| 33 | -DCMAKE_SYSTEM_PROCESSOR=${ci_target%-*-*} \ | 31 | -DCMAKE_SYSTEM_PROCESSOR=${ci_target%-*-*} \ |