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

Revert "build: remove buildflags workaround (#27372)" (#27410)

Browse source 
This reverts commit e4fc47f557.
This commit is contained in:
John Kleinschmidt 2021-01-20 14:21:53 -05:00 committed by GitHub
parent b6a0fcd51d
commit 2153e47502
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config.yml
View file

@ -447,6 +447,10 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
# Fix Clang Install (wrong binary) # Fix Clang Install (wrong binary)
rm -rf src/third_party/llvm-build rm -rf src/third_party/llvm-build
python src/tools/clang/scripts/update.py python src/tools/clang/scripts/update.py
# Temporarily use an older version of gn
unset CI
python src/buildtools/ensure_gn_version.py git_revision:53d92014bf94c3893886470a1c7c1289f8818db0
export CI=true
fi fi
step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac

2
BUILD.gn
View file

@ -3,7 +3,6 @@ import("//build/config/ui.gni")
import("//build/config/win/manifest.gni") import("//build/config/win/manifest.gni")
import("//components/spellcheck/spellcheck_build_features.gni") import("//components/spellcheck/spellcheck_build_features.gni")
import("//content/public/app/mac_helpers.gni") import("//content/public/app/mac_helpers.gni")
import("//electron/buildflags/buildflags.gni")
import("//extensions/buildflags/buildflags.gni") import("//extensions/buildflags/buildflags.gni")
import("//pdf/features.gni") import("//pdf/features.gni")
import("//ppapi/buildflags/buildflags.gni") import("//ppapi/buildflags/buildflags.gni")
@ -21,6 +20,7 @@ import("build/npm.gni")
import("build/templated_file.gni") import("build/templated_file.gni")
import("build/tsc.gni") import("build/tsc.gni")
import("build/webpack/webpack.gni") import("build/webpack/webpack.gni")
import("buildflags/buildflags.gni")
import("electron_paks.gni") import("electron_paks.gni")
import("filenames.auto.gni") import("filenames.auto.gni")
import("filenames.gni") import("filenames.gni")