From 5d80a9135161aaabc08b5704a291865ffc4421b3 Mon Sep 17 00:00:00 2001 From: Max Zhang <60412045+maxz-lab@users.noreply.github.com> Date: Wed, 8 May 2024 09:58:26 -0700 Subject: [PATCH] Build abi_wrapper with correct toolchain (#3185) Build starboard_layer_posix_*_abi_wrappers files with correct toolchain. b/330771976 --- starboard/shared/modular/BUILD.gn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/starboard/shared/modular/BUILD.gn b/starboard/shared/modular/BUILD.gn index 7d76132d5166..6149fbf4f45f 100644 --- a/starboard/shared/modular/BUILD.gn +++ b/starboard/shared/modular/BUILD.gn @@ -14,7 +14,9 @@ # 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) { +if ((sb_is_modular || sb_is_evergreen_compatible) && + (current_toolchain == starboard_toolchain || + build_with_separate_cobalt_toolchain)) { source_set("starboard_layer_posix_abi_wrappers") { sources = [ "starboard_layer_posix_file_abi_wrappers.cc",