diff options
| -rwxr-xr-x | build.sh | 12 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 4 |
2 files changed, 15 insertions, 1 deletions
@@ -214,7 +214,17 @@ function build { if [[ -n $current_target ]]; then cargo_target_arg+=(--target="$current_target") fi - cargo build "${cargo_target_arg[@]}" "${CARGO_ARGS[@]}" + local cargo_crates_to_build=( + -p mullvad-daemon --bin mullvad-daemon + -p mullvad-cli --bin mullvad + -p mullvad-setup --bin mullvad-setup + -p mullvad-problem-report --bin mullvad-problem-report + -p talpid-openvpn-plugin --lib + ) + if [[ ("$(uname -s)" == "Linux") ]]; then + cargo_crates_to_build+=(-p mullvad-exclude --bin mullvad-exclude) + fi + cargo build "${cargo_target_arg[@]}" "${CARGO_ARGS[@]}" "${cargo_crates_to_build[@]}" ################################################################################ # Move binaries to correct locations in dist-assets diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index 709a061326..a6e8faa4d3 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -7,6 +7,10 @@ license = "GPL-3.0" edition = "2021" publish = false +[features] +# Allow the API server to use to be configured +api-override = ["mullvad-api/api-override"] + [dependencies] cfg-if = "1.0" chrono = { version = "0.4.19", features = ["serde"] } |