Merge branch 'only-build-the-rust-we-need-on-desktop-des-220'

2 files changed, 15 insertions, 1 deletions

diff --git a/build.sh b/build.sh
index 9bf315604e..30b954c9ad 100755
--- a/build.sh
+++ b/build.sh
@@ -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"] }