diff options
| author | Linus Färnstrand <faern@faern.net> | 2021-12-27 13:56:20 +0100 |
|---|---|---|
| committer | Linus Färnstrand <faern@faern.net> | 2021-12-27 13:56:47 +0100 |
| commit | 0b6cb0de5b559fd1f105fd908c471d730e326435 (patch) | |
| tree | 51b44b483568267362a1f3edd78585a01621d71a | |
| parent | 1d11af34aee319aa010a2237f8105336848f01e0 (diff) | |
| download | mullvadvpn-0b6cb0de5b559fd1f105fd908c471d730e326435.tar.xz mullvadvpn-0b6cb0de5b559fd1f105fd908c471d730e326435.zip | |
Remove buildTargets function and just call that code directly
| -rwxr-xr-x | build.sh | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -238,18 +238,6 @@ function build { done } -function buildTargets { - if [[ -n ${TARGET:-""} ]]; then - for t in ${TARGET[*]}; do - source env.sh "$t" - build "$t" - done - else - source env.sh "" - build - fi -} - if [[ "$(uname -s)" == "Darwin" || "$(uname -s)" == "Linux" ]]; then mkdir -p "dist-assets/shell-completions" for sh in bash zsh fish; do @@ -262,7 +250,16 @@ fi ./update-relays.sh ./update-api-address.sh -buildTargets +# Compile for all defined targets, or the current architecture if unspecified. +if [[ -n ${TARGET:-""} ]]; then + for t in ${TARGET[*]}; do + source env.sh "$t" + build "$t" + done +else + source env.sh "" + build +fi if [[ "$BUILD_MODE" == "release" && "$(uname -s)" == "MINGW"* ]]; then signdep=( |
