diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-06-05 16:14:08 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-07-02 12:16:33 +0200 |
| commit | 0b7db4052b312e8f6d9d6458c8f34388f7746a4e (patch) | |
| tree | 8f9ec0017518ccc532881fa128a32e5b81396c31 | |
| parent | 8b3d5e40f56f45d632f2595c0787be3854740e59 (diff) | |
| download | mullvadvpn-0b7db4052b312e8f6d9d6458c8f34388f7746a4e.tar.xz mullvadvpn-0b7db4052b312e8f6d9d6458c8f34388f7746a4e.zip | |
Add linking env vars for Linux in build.sh and .travis.yml
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | build.sh | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index be815c7db0..3a4dcdf3a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ sudo: false env: global: - MACOSX_DEPLOYMENT_TARGET="10.7" + - LIBMNL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" + - LIBNFTNL_LIB_DIR="$TRAVIS_BUILD_DIR/dist-assets/binaries/linux" git: submodules: false @@ -7,13 +7,17 @@ set -eu +SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" + ################################################################################ # Platform specific configuration. ################################################################################ case "$(uname -s)" in Linux*) - # config + # Use static builds of libmnl and libnftnl from the binaries submodule + export LIBMNL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/linux" + export LIBNFTNL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/linux" ;; Darwin*) export MACOSX_DEPLOYMENT_TARGET="10.7" @@ -68,7 +72,6 @@ if [[ "${1:-""}" != "--dev-build" ]]; then fi cargo +stable clean - else echo "!! Development build. Not for general distribution !!" GIT_COMMIT=$(git rev-parse --short HEAD) |