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: fix arm64 compilation #46231

Closed
wants to merge 2 commits into from
Closed

build: fix arm64 compilation #46231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb773ba
* fix arm64 compilation
eukarpov Jan 16, 2023
6ab9a0c
* keep the headers in the alphabetical order
eukarpov Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#ifndef V8_SNAPSHOT_EMBEDDED_PLATFORM_EMBEDDED_FILE_WRITER_BASE_H_
#define V8_SNAPSHOT_EMBEDDED_PLATFORM_EMBEDDED_FILE_WRITER_BASE_H_

#include "src/objects/fixed-array-inl.h"

#include <cinttypes>
#include <cstdio> // For FILE.
#include <memory>
Expand Down
1 change: 1 addition & 0 deletions deps/v8/src/snapshot/mksnapshot.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "src/base/vector.h"
#include "src/codegen/cpu-features.h"
#include "src/flags/flags.h"
#include "src/objects/fixed-array-inl.h"
#include "src/snapshot/embedded/embedded-file-writer.h"
#include "src/snapshot/snapshot.h"

Expand Down
5 changes: 4 additions & 1 deletion tools/gyp/pylib/gyp/generator/msvs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3633,7 +3633,10 @@ def _AddSources2(
elif file_name.startswith("$("):
file_name = re.sub(r"^\$\([^)]+\)\\", "", file_name)
detail.append(["ObjectFileName", "$(IntDir)\\" + file_name])
grouped_sources[group].append([element, {"Include": source}] + detail)
element_node = [element, {"Include": source}]
if element == "MARMASM":
element_node.append(["PreprocessedFileName", source + ".pp"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks vaguely similar to nodejs/gyp-next#162.

(gyp-next is where this change should go but maybe you can coordinate with the author of that pull request.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code must avoid generating files in the source tree. The generated files must go to the $(IntDir). PR #46228 solves this issue without changing GYP by adding directory.build.props file to override PreprocessedFileName locally.

grouped_sources[group].append(element_node + detail)


def _GetMSBuildProjectReferences(project):
Expand Down