diff --git a/starboard/build/config/BUILDCONFIG.gn b/starboard/build/config/BUILDCONFIG.gn
index 2338a7067702..f22166fe53cc 100644
--- a/starboard/build/config/BUILDCONFIG.gn
+++ b/starboard/build/config/BUILDCONFIG.gn
@@ -522,8 +522,10 @@ template("shared_library") {
         deps = [
           ":$original_target_name($cobalt_toolchain)",
           "//starboard:starboard_platform_group($starboard_toolchain)",
-          "//starboard:starboard_platform_group_install($starboard_toolchain)",
         ]
+        if (!separate_install_targets_for_bundling) {
+          deps += [ "//starboard:starboard_platform_group_install($starboard_toolchain)" ]
+        }
       }
       copy("${actual_target_name}_loader_copy") {
         forward_variables_from(invoker, [ "testonly" ])
diff --git a/starboard/raspi/2/platform_configuration/configuration.gni b/starboard/raspi/2/platform_configuration/configuration.gni
index 8a175e1779e1..ad65232ac153 100644
--- a/starboard/raspi/2/platform_configuration/configuration.gni
+++ b/starboard/raspi/2/platform_configuration/configuration.gni
@@ -19,6 +19,8 @@ if (current_toolchain != default_toolchain ||
 
   sb_evergreen_compatible_use_libunwind = true
   sb_is_evergreen_compatible = true
+}
 
+if (!build_with_separate_cobalt_toolchain) {
   separate_install_targets_for_bundling = true
 }