diff options
| author | Jon Kunkee <jkunkee@microsoft.com> | 2018-12-31 16:26:22 -0800 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2019-04-11 17:44:10 +0100 |
| commit | 06c10cdc4c20e46885e3af94281ec63cda5e7712 (patch) | |
| tree | 27ff13928621221c72de56e58affd905e376829d /tools/gyp/pylib/gyp/MSVSSettings.py | |
| parent | ee7daf76c01cdcd4a9ff1a7d1f2591b0886afba3 (diff) | |
| download | android-node-v8-06c10cdc4c20e46885e3af94281ec63cda5e7712.tar.gz android-node-v8-06c10cdc4c20e46885e3af94281ec63cda5e7712.tar.bz2 android-node-v8-06c10cdc4c20e46885e3af94281ec63cda5e7712.zip | |
build,win: teach GYP MSVS generator about MARMASM
The toolchain for ARM64 Windows includes support for assembly code, but
with a very different syntax from MASM and NASM. This change teaches
GYP how to emit the right XML tags in VCXPROJ files to support
compiling assembly files with the new tool.
PR-URL: https://github.com/nodejs/node/pull/26020
Refs: https://github.com/nodejs/node/issues/25998
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: João Reis <reis@janeasystems.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'tools/gyp/pylib/gyp/MSVSSettings.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/MSVSSettings.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/gyp/pylib/gyp/MSVSSettings.py b/tools/gyp/pylib/gyp/MSVSSettings.py index 99c53a8570..58ce0bb1ed 100644 --- a/tools/gyp/pylib/gyp/MSVSSettings.py +++ b/tools/gyp/pylib/gyp/MSVSSettings.py @@ -539,6 +539,7 @@ _rc = _Tool('VCResourceCompilerTool', 'ResourceCompile') _lib = _Tool('VCLibrarianTool', 'Lib') _manifest = _Tool('VCManifestTool', 'Manifest') _masm = _Tool('MASM', 'MASM') +_armasm = _Tool('ARMASM', 'ARMASM') _AddTool(_compile) @@ -548,6 +549,7 @@ _AddTool(_rc) _AddTool(_lib) _AddTool(_manifest) _AddTool(_masm) +_AddTool(_armasm) # Add sections only found in the MSBuild settings. _msbuild_validators[''] = {} _msbuild_validators['ProjectReference'] = {} |