From 5e17dd5e72e6cdd6ede4169191971df2c101db15 Mon Sep 17 00:00:00 2001 From: "Brian J. Cardiff" Date: Tue, 26 Dec 2017 21:59:22 -0300 Subject: [PATCH] Update bin/ci to use LIBRARY_PATH from 0.24.1 (#5461) --- .travis.yml | 2 +- bin/ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ffe45c724a1b..b6ab04e5d6ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: matrix: fast_finish: true include: - - env: ARCH=i386 ARCH_CMD=linux32 + - env: ARCH=i386 ARCH_CMD=linux32 ARCH_LIBRARY_PATH=/opt/crystal/embedded/lib/ os: linux - env: ARCH=x86_64 ARCH_CMD=linux64 DEPLOY=true os: linux diff --git a/bin/ci b/bin/ci index e890d2199c50..bb6f327795ca 100755 --- a/bin/ci +++ b/bin/ci @@ -164,7 +164,7 @@ with_build_env() { -u $(id -u) \ -v $(pwd):/mnt \ -w /mnt \ - -e LIBRARY_PATH="/opt/crystal/embedded/lib/" \ + -e LIBRARY_PATH="${ARCH_LIBRARY_PATH:-/usr/lib/crystal/lib/}" \ -e CRYSTAL_CACHE_DIR="/tmp/crystal" \ "jhass/crystal-build-$ARCH" \ "$ARCH_CMD" /bin/bash -c "'$command'"