summaryrefslogtreecommitdiff
path: root/tools/gyp
diff options
context:
space:
mode:
authorBartosz Sosnowski <bartosz@janeasystems.com>2018-11-21 14:28:24 +0100
committerBartosz Sosnowski <bartosz@janeasystems.com>2018-11-29 11:09:03 +0100
commit9920dbcaf389901786aeb31d2feb886dfd3f073b (patch)
tree70e38352b2190d13d8c057b982f243c6a04dc700 /tools/gyp
parent2c473d65a4ef77d4f7880993503852ab2c7137ca (diff)
downloadandroid-node-v8-9920dbcaf389901786aeb31d2feb886dfd3f073b.tar.gz
android-node-v8-9920dbcaf389901786aeb31d2feb886dfd3f073b.tar.bz2
android-node-v8-9920dbcaf389901786aeb31d2feb886dfd3f073b.zip
build, tools, win: add .S files support to GYP
Makes GYP properly handle .S files. Fixes: https://github.com/nodejs/node-v8/issues/89 PR-URL: https://github.com/nodejs/node/pull/24553 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'tools/gyp')
-rw-r--r--tools/gyp/pylib/gyp/generator/msvs.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/gyp/pylib/gyp/generator/msvs.py b/tools/gyp/pylib/gyp/generator/msvs.py
index 8fe9e5af23..923e897e48 100644
--- a/tools/gyp/pylib/gyp/generator/msvs.py
+++ b/tools/gyp/pylib/gyp/generator/msvs.py
@@ -2156,6 +2156,7 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
A pair of (group this file should be part of, the label of element)
"""
_, ext = os.path.splitext(source)
+ ext = ext.lower()
if ext in extension_to_rule_name:
group = 'rule'
element = extension_to_rule_name[ext]
@@ -2168,7 +2169,7 @@ def _MapFileToMsBuildSourceType(source, rule_dependencies,
elif ext == '.rc':
group = 'resource'
element = 'ResourceCompile'
- elif ext == '.asm':
+ elif ext in ['.s', '.asm']:
group = 'masm'
element = 'MASM'
elif ext == '.idl':