mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: fix intermittent compilation failures on macOS (#33768)

Browse source 
* build: fix intermittent compilation failures on macOS

* chore: remove //base dependency from main executable

* chore: fix lint

Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
Milan Burda 2022-04-21 10:25:51 +02:00 committed by GitHub
parent 00021a41b1
commit 64517b36ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BUILD.gn
View file

@ -1072,7 +1072,6 @@ if (is_mac) {
"shell/app/electron_main_mac.cc", "shell/app/electron_main_mac.cc",
"shell/app/uv_stdio_fix.cc", "shell/app/uv_stdio_fix.cc",
"shell/app/uv_stdio_fix.h", "shell/app/uv_stdio_fix.h",
"shell/common/electron_constants.cc",
] ]
include_dirs = [ "." ] include_dirs = [ "." ]
deps = [ deps = [

4
shell/app/electron_main_mac.cc
View file

@ -10,7 +10,6 @@
#include "electron/fuses.h" #include "electron/fuses.h"
#include "shell/app/electron_library_main.h" #include "shell/app/electron_library_main.h"
#include "shell/app/uv_stdio_fix.h" #include "shell/app/uv_stdio_fix.h"
#include "shell/common/electron_constants.h"
#if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD) #if defined(HELPER_EXECUTABLE) && !defined(MAS_BUILD)
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
@ -33,7 +32,8 @@ int main(int argc, char* argv[]) {
FixStdioStreams(); FixStdioStreams();
#if BUILDFLAG(ENABLE_RUN_AS_NODE) #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); return ElectronInitializeICUandStartNode(argc, argv);
} }
#endif #endif