Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ce1823e
deps: update V8 to 8.5.210
targos Sep 7, 2020
a8633d2
build: reset embedder string to "-node.0"
targos Sep 7, 2020
54c70a4
src: update NODE_MODULE_VERSION to 88
targos Sep 7, 2020
bb7db67
deps: V8: un-cherry-pick bd019bd
refack Mar 27, 2019
85cc8e0
deps: patch V8 to run on older XCode versions
ryzokuken Sep 14, 2019
c07a11a
deps: V8: patch register-arm64.h
refack May 22, 2019
f16624d
deps: V8: forward declaration of `Rtl*FunctionTable`
refack May 22, 2019
3d310d0
deps: make v8.h compatible with VS2015
joaocgreis Nov 1, 2019
75ff275
deps: V8: silence irrelevant warnings
targos Mar 27, 2019
cbc39a6
deps: patch V8 to run on Xcode 8
mmarchini Mar 10, 2020
b0e014b
deps: update V8 postmortem metadata script
cjihrig Jul 4, 2020
9c0fc5b
deps: V8: cherry-pick 2d5017a0fc02
targos Jul 13, 2020
ed14532
deps: V8: cherry-pick 4ece1067855b
targos Aug 15, 2020
148a8fb
deps: V8: cherry-pick e06ace6b5cdb
addaleax Aug 7, 2020
65f6fa7
deps: V8: backport 3f071e3e7e15
Sep 3, 2020
9f6c30e
deps: V8: cherry-pick 6be2f6e26e8d
Sep 4, 2020
d7d6ad4
deps: V8: cherry-pick e996b743171f
targos Sep 7, 2020
7fe7b90
deps: V8: update postmortem metadata script
cjihrig Sep 15, 2020
f84fa05
tools: update V8 gypfiles for 8.5
ryzokuken May 12, 2020
2f9d8a3
test: update tests after increasing typed array size to 4GB
ktran Jun 18, 2020
7e3a2e4
wasi: drop --experimental-wasm-bigint requirement
cjihrig Jul 22, 2020
4f0d08c
[hack]: fix gyp for duplicate basename
targos Sep 7, 2020
e0558cf
testing arm64 gyp fix
targos Sep 18, 2020
e7e06e8
tools: use v8_current_cpu
targos Sep 26, 2020
915dad1
ugly try
targos Sep 26, 2020
fceae5a
add log
targos Sep 27, 2020
e390638
last try
targos Sep 27, 2020
d0d56fb
try fix
targos Sep 29, 2020
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
Prev Previous commit
Next Next commit
testing arm64 gyp fix
  • Loading branch information
targos committed Sep 23, 2020
commit e0558cf2ca8fcfc7101b3e484e1c197f3db02440
9 changes: 5 additions & 4 deletions tools/gyp/pylib/gyp/generator/msvs.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
"msvs_enable_winrt",
"msvs_requires_importlibrary",
"msvs_enable_winphone",
"msvs_enable_marmasm",
"msvs_application_type_revision",
"msvs_target_platform_version",
"msvs_target_platform_minversion",
Expand Down Expand Up @@ -3671,6 +3670,7 @@ def _GetMSBuildProjectReferences(project):
def _GenerateMSBuildProject(project, options, version, generator_flags, spec):
spec = project.spec
configurations = spec["configurations"]
toolset = spec["toolset"]
project_dir, project_file_name = os.path.split(project.path)
gyp.common.EnsureDirExists(project.path)
# Prepare list of sources and excluded sources.
Expand All @@ -3684,6 +3684,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags, spec):
rule_dependencies = set()
extension_to_rule_name = {}
list_excluded = generator_flags.get("msvs_list_excluded_files", True)
platforms = _GetUniquePlatforms(spec)

# Don't generate rules if we are using an external builder like ninja.
if not spec.get("msvs_external_builder"):
Expand Down Expand Up @@ -3726,7 +3727,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags, spec):
sources,
rule_dependencies,
extension_to_rule_name,
_GetUniquePlatforms(spec),
platforms,
)
missing_sources = _VerifySourcesExist(sources, project_dir)

Expand Down Expand Up @@ -3779,7 +3780,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags, spec):
content += _GetMSBuildLocalProperties(project.msbuild_toolset)
content += import_cpp_props_section
content += import_masm_props_section
if spec.get("msvs_enable_marmasm"):
if toolset == "target" and "arm64" in platforms:
content += import_marmasm_props_section
content += _GetMSBuildExtensions(props_files_of_rules)
content += _GetMSBuildPropertySheets(configurations, spec)
Expand All @@ -3801,7 +3802,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags, spec):
content += _GetMSBuildProjectReferences(project)
content += import_cpp_targets_section
content += import_masm_targets_section
if spec.get("msvs_enable_marmasm"):
if toolset == "target" and "arm64" in platforms:
content += import_marmasm_targets_section
content += _GetMSBuildExtensionTargets(targets_files_of_rules)

Expand Down