Skip to content

Commit 4fa3310

Browse files
VerteDindeMarshallOfSoundjkleinsc
authored
build: add stack_trace.h to main delegate (electron#32854)
* build: add stack_trace.h to main delegate * build: trigger circleci * build: free up a tiny bit more space * build: disable use_thin_lto * fixup build/args/all.gn Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
1 parent ceab6a1 commit 4fa3310

File tree

3 files changed

+34
-31
lines changed

3 files changed

+34
-31
lines changed

.circleci/build_config.yml

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,10 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
349349
command: |
350350
if [ "`uname`" == "Darwin" ]; then
351351
sudo mkdir -p $TMPDIR/del-target
352-
if [ "$TARGET_ARCH" == "arm64" ]; then
353-
# Remount the root volume as writable, don't ask questions plz
354-
sudo mount -uw /
355-
fi
352+
353+
# Remount the root volume as writable, don't ask questions plz
354+
sudo mount -uw /
355+
356356
tmpify() {
357357
if [ -d "$1" ]; then
358358
sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
@@ -394,33 +394,32 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
394394
tmpify /usr/local/Homebrew
395395
sudo rm -rf $TMPDIR/del-target
396396
397-
if [ "$TARGET_ARCH" == "arm64" ]; then
398-
sudo rm -rf "/System/Library/Desktop Pictures"
399-
sudo rm -rf /System/Library/Templates/Data
400-
sudo rm -rf /System/Library/Speech/Voices
401-
sudo rm -rf "/System/Library/Screen Savers"
402-
sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
403-
sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
404-
sudo rm -rf /System/Volumes/Data/Library/Java
405-
sudo rm -rf /System/Volumes/Data/Library/Ruby
406-
sudo rm -rf /System/Volumes/Data/Library/Printers
407-
sudo rm -rf /System/iOSSupport
408-
sudo rm -rf /System/Applications/*.app
409-
sudo rm -rf /System/Applications/Utilities/*.app
410-
sudo rm -rf /System/Library/LinguisticData
411-
sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
412-
# sudo rm -rf /System/Library/Fonts/*
413-
# sudo rm -rf /System/Library/PreferencePanes
414-
sudo rm -rf /System/Library/AssetsV2/*
415-
sudo rm -rf /Applications/Safari.app
416-
sudo rm -rf ~/project/src/build/linux
417-
sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
418-
sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
419-
420-
# lipo off some huge binaries arm64 versions to save space
421-
strip_arm_deep $(xcode-select -p)/../SharedFrameworks
422-
strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
423-
fi
397+
sudo rm -rf "/System/Library/Desktop Pictures"
398+
sudo rm -rf /System/Library/Templates/Data
399+
sudo rm -rf /System/Library/Speech/Voices
400+
sudo rm -rf "/System/Library/Screen Savers"
401+
sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
402+
sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
403+
sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/
404+
sudo rm -rf /System/Volumes/Data/Library/Java
405+
sudo rm -rf /System/Volumes/Data/Library/Ruby
406+
sudo rm -rf /System/Volumes/Data/Library/Printers
407+
sudo rm -rf /System/iOSSupport
408+
sudo rm -rf /System/Applications/*.app
409+
sudo rm -rf /System/Applications/Utilities/*.app
410+
sudo rm -rf /System/Library/LinguisticData
411+
sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
412+
# sudo rm -rf /System/Library/Fonts/*
413+
# sudo rm -rf /System/Library/PreferencePanes
414+
sudo rm -rf /System/Library/AssetsV2/*
415+
sudo rm -rf /Applications/Safari.app
416+
sudo rm -rf ~/project/src/build/linux
417+
sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
418+
sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
419+
420+
# lipo off some huge binaries arm64 versions to save space
421+
strip_arm_deep $(xcode-select -p)/../SharedFrameworks
422+
strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
424423
fi
425424
background: true
426425

build/args/all.gn

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ enable_pseudolocales = false
3535

3636
is_cfi = false
3737

38+
# This consumes a bit too much disk space on macOS
39+
use_thin_lto = false
40+
3841
# Make application name configurable at runtime for cookie crypto
3942
allow_runtime_configurable_key_storage = true
4043

shell/app/electron_main_delegate.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include "base/base_switches.h"
1313
#include "base/command_line.h"
14+
#include "base/debug/stack_trace.h"
1415
#include "base/environment.h"
1516
#include "base/files/file_util.h"
1617
#include "base/logging.h"

0 commit comments

Comments
 (0)