diff options
| author | Emīls <emils@mullvad.net> | 2018-07-02 19:54:47 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-07-05 16:05:36 +0100 |
| commit | d9c2666ad0a1c923ef536e932d6aa0f2d9155dd9 (patch) | |
| tree | b0ff34ee945b2ae834026a796659263e3d4893bb | |
| parent | 14cc75514579caa5cb7dbf1b48c03ed78e0d195a (diff) | |
| download | mullvadvpn-d9c2666ad0a1c923ef536e932d6aa0f2d9155dd9.tar.xz mullvadvpn-d9c2666ad0a1c923ef536e932d6aa0f2d9155dd9.zip | |
Accomodate build.sh to support OpenSSL
| -rwxr-xr-x | build.sh | 29 |
1 files changed, 2 insertions, 27 deletions
@@ -7,32 +7,11 @@ set -eu -SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" - -################################################################################ -# Platform specific configuration. -################################################################################ - -case "$(uname -s)" in - Linux*) - # 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" - PLATFORM="linux" - ;; - Darwin*) - export MACOSX_DEPLOYMENT_TARGET="10.7" - PLATFORM="macos" - ;; - MINGW*) - PLATFORM="windows" - ;; -esac - ################################################################################ # Verify and configure environment. ################################################################################ +SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" RUSTC_VERSION=`rustc +stable --version` PRODUCT_VERSION=$(node -p "require('./package.json').version" | sed -Ee 's/\.0//g') @@ -110,10 +89,6 @@ sed -i.bak \ # Compile and link all binaries. ################################################################################ -export OPENSSL_STATIC="1" -export OPENSSL_LIB_DIR="$SCRIPT_DIR/dist-assets/binaries/$PLATFORM" -export OPENSSL_INCLUDE_DIR="$SCRIPT_DIR/dist-assets/binaries/openssl/include" - if [[ "$(uname -s)" == "MINGW"* ]]; then CPP_BUILD_MODES="Release" ./build_windows_modules.sh $@ fi @@ -139,7 +114,7 @@ if [[ "$(uname -s)" != "MINGW"* ]]; then fi echo "Updating relay list..." -./target/release/list-relays > dist-assets/relays.json +MULLVAD_RESOURCE_DIR="$SCRIPT_DIR/dist-assets/" ./target/release/list-relays > dist-assets/relays.json echo "Installing JavaScript dependencies..." yarn install |