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

build: ensure that mksnapshot for Apple Silicon has all of the needed files for snapshot generation #29338

Merged
merged 2 commits into from May 26, 2021
Merged

build: ensure that mksnapshot for Apple Silicon has all of the needed files for snapshot generation #29338

merged 2 commits into from May 26, 2021

Conversation

jkleinsc
Copy link
Contributor

Description of Change

Fixes #29337.

mksnapshot.zip for macOS arm64 (Apple Silicon) was missing two needed files:
mksnapshot_args and clang_x64_v8_arm64/gen/v8/embedded.S. This PR adds those files to mksnapshot.zip for macOS arm64

Checklist

Release Notes

Notes: Fixed using custom v8 snapshots on Apple Silicon.

@jkleinsc jkleinsc added semver/patch backwards-compatible bug fixes target/11-x-y labels May 26, 2021
@jkleinsc jkleinsc merged commit d0b9a93 into master May 26, 2021
@release-clerk
Copy link

release-clerk bot commented May 26, 2021

Release Notes Persisted

Fixed using custom v8 snapshots on Apple Silicon.

@jkleinsc jkleinsc deleted the save-mksnapshot-args-mac-arm64 branch May 26, 2021 16:08
@trop
Copy link
Contributor

trop bot commented May 26, 2021

I was unable to backport this PR to "11-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot removed the target/11-x-y label May 26, 2021
@trop
Copy link
Contributor

trop bot commented May 26, 2021

I was unable to backport this PR to "12-x-y" cleanly;
you will need to perform this backport manually.

@trop trop bot mentioned this pull request May 26, 2021
Merged
@trop
Copy link
Contributor

trop bot commented May 26, 2021

I have automatically backported this PR to "13-x-y", please check out #29339

jkleinsc added a commit that referenced this pull request May 26, 2021
@jkleinsc
build: ensure that mksnapshot for Apple Silicon has all of the needed…
e5d7c02 
… files for snapshot generation (#29338)

* build: include mksnapshot args in arm64 mksnapshot.zip

* get gen/v8/embedded.S from proper location

(cherry picked from commit d0b9a93)
@jkleinsc jkleinsc mentioned this pull request May 26, 2021
Merged
@trop
Copy link
Contributor

trop bot commented May 26, 2021

@jkleinsc has manually backported this PR to "12-x-y", please check out #29341

@jkleinsc jkleinsc mentioned this pull request May 26, 2021
Merged
jkleinsc added a commit that referenced this pull request May 26, 2021
@jkleinsc
build: ensure that mksnapshot for Apple Silicon has all of the needed…
8b02dba 
… files for snapshot generation (#29338) (#29341)

* build: include mksnapshot args in arm64 mksnapshot.zip

* get gen/v8/embedded.S from proper location

(cherry picked from commit d0b9a93)
@trop trop bot mentioned this pull request May 26, 2021
Merged
trop bot pushed a commit that referenced this pull request May 26, 2021
@jkleinsc @electron-bot
build: ensure that mksnapshot for Apple Silicon has all of the needed…
71ea497 
… files for snapshot generation (#29338)

* build: include mksnapshot args in arm64 mksnapshot.zip

* get gen/v8/embedded.S from proper location

(cherry picked from commit d0b9a93)
jkleinsc added a commit that referenced this pull request May 27, 2021
@trop @jkleinsc
build: ensure that mksnapshot for Apple Silicon has all of the needed…
ad07075 
… files for snapshot generation (#29338) (#29347)

* build: include mksnapshot args in arm64 mksnapshot.zip

* get gen/v8/embedded.S from proper location

(cherry picked from commit d0b9a93)

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarshallOfSound MarshallOfSound MarshallOfSound approved these changes

Assignees
No one assigned
Labels
semver/patch backwards-compatible bug fixes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Using custom v8 snapshots on Apple Silicon does not work
2 participants
@jkleinsc @MarshallOfSound