Refine toolchain selection condition

This is a rework of PR #3185. b/330771976
youtube · May 10, 2024 · 152c3c2 · 152c3c2
1 parent 79adf53
commit 152c3c2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/starboard/elf_loader/BUILD.gn b/starboard/elf_loader/BUILD.gn
@@ -58,9 +58,12 @@ static_library("elf_loader") {
     ":evergreen_info",
     "//starboard:starboard_group",
     "//starboard/common",
-    "//starboard/shared/modular:starboard_layer_posix_abi_wrappers",
     "//third_party/lz4_lib:lz4",
   ]
+
+  if (current_toolchain == starboard_toolchain) {
+    deps += [ "//starboard/shared/modular:starboard_layer_posix_abi_wrappers" ]
+  }
 }
 
 if (sb_is_evergreen_compatible && current_toolchain == starboard_toolchain) {

diff --git a/starboard/shared/modular/BUILD.gn b/starboard/shared/modular/BUILD.gn
@@ -15,8 +15,7 @@
 # TODO: b/315170518 - Revert to static library after fixing
 # symbol visibility issues for windows based modular platform builds.
 if ((sb_is_modular || sb_is_evergreen_compatible) &&
-    (current_toolchain == starboard_toolchain ||
-     build_with_separate_cobalt_toolchain)) {
+    current_toolchain == starboard_toolchain) {
   source_set("starboard_layer_posix_abi_wrappers") {
     sources = [
       "starboard_layer_posix_mmap_abi_wrappers.cc",