From 64517b36efb06464fcf6d2f214fd75d833fdb07a Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Thu, 21 Apr 2022 10:25:51 +0200 Subject: [PATCH] build: fix intermittent compilation failures on macOS (#33768) * build: fix intermittent compilation failures on macOS * chore: remove //base dependency from main executable * chore: fix lint Co-authored-by: deepak1556 --- BUILD.gn | 1 - shell/app/electron_main_mac.cc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 039250e5a955..883f9c4146e3 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1072,7 +1072,6 @@ if (is_mac) { "shell/app/electron_main_mac.cc", "shell/app/uv_stdio_fix.cc", "shell/app/uv_stdio_fix.h", - "shell/common/electron_constants.cc", ] include_dirs = [ "." ] deps = [ diff --git a/shell/app/electron_main_mac.cc b/shell/app/electron_main_mac.cc index c040db6624c6..c817df186e20 100644 --- a/shell/app/electron_main_mac.cc +++ b/shell/app/electron_main_mac.cc @@ -10,7 +10,6 @@ #include "electron/fuses.h" #include "shell/app/electron_library_main.h" #include "shell/app/uv_stdio_fix.h" -#include "shell/common/electron_constants.h" #if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD) #include @@ -33,7 +32,8 @@ int main(int argc, char* argv[]) { FixStdioStreams(); #if BUILDFLAG(ENABLE_RUN_AS_NODE) - if (electron::fuses::IsRunAsNodeEnabled() && IsEnvSet(electron::kRunAsNode)) { + if (electron::fuses::IsRunAsNodeEnabled() && + IsEnvSet("ELECTRON_RUN_AS_NODE")) { return ElectronInitializeICUandStartNode(argc, argv); } #endif