Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick PR #1206: Set sb_is_modular appropriately, build linux using sb_is_modular #1208

Merged
merged 1 commit into from
Aug 22, 2023
Merged

Cherry pick PR #1206: Set sb_is_modular appropriately, build linux using sb_is_modular #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions starboard/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ group("starboard") {
"//starboard/client_porting/eztime",
]

if (sb_is_modular) {
if (sb_is_modular && current_toolchain == cobalt_toolchain) {
public_deps += [
"//third_party/llvm-project/compiler-rt:compiler_rt",
"//third_party/llvm-project/libcxx:cxx",
Expand Down Expand Up @@ -192,7 +192,7 @@ if (current_toolchain == starboard_toolchain) {
} else {
public_deps += [ "//third_party/crashpad/wrapper:wrapper_stub" ]
}
if (!sb_is_modular) {
if (!sb_is_evergreen) {
public_deps += [ "//$starboard_path:starboard_platform" ]
}
}
Expand Down
3 changes: 2 additions & 1 deletion starboard/build/config/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@ config("warnings_as_errors") {
# override flags specified in a platform's "platform_configuration" config,
# which is where these particular flags would otherwise naturally fit.
config("default_compiler_flags") {
if (is_starboardized_toolchain && sb_is_modular && target_cpu == "arm") {
if (is_starboardized_toolchain && sb_is_modular &&
current_toolchain == cobalt_toolchain && target_cpu == "arm") {
cflags = [ "-mfpu=vfpv3" ]
asmflags = cflags
}
Expand Down
3 changes: 3 additions & 0 deletions starboard/build/config/BUILDCONFIG.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ import("//starboard/build/config/toolchain_variables.gni")
import("//$starboard_path/platform_configuration/configuration.gni")
import("//starboard/build/config/build_assertions.gni")

# TODO(b/295399926) Clean up flag by moving to modular/helper_var.gni
sb_is_modular = sb_is_evergreen || build_with_separate_cobalt_toolchain

declare_args() {
use_tsan = getenv("USE_TSAN") == 1
}
Expand Down
4 changes: 1 addition & 3 deletions starboard/evergreen/shared/platform_configuration/configuration.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@

import("//starboard/build/config/base_configuration.gni")

sb_is_modular = true

sb_is_evergreen = true
sb_is_evergreen = !build_with_separate_cobalt_toolchain

cobalt_font_package = "empty"

Expand Down
2 changes: 1 addition & 1 deletion starboard/extension/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ target(gtest_target_type, "extension_test") {
"//testing/gmock",
"//testing/gtest",
]
if (sb_is_modular) {
if (sb_is_modular && current_toolchain == cobalt_toolchain) {
deps += cobalt_platform_dependencies
}
}
2 changes: 1 addition & 1 deletion starboard/linux/shared/platform_configuration/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ config("platform_configuration") {
"rt",
]

if (!sb_is_modular) {
if (!sb_is_modular || current_toolchain != cobalt_toolchain) {
ldflags += [ "-static-libstdc++" ]
}

Expand Down