From 7e3babf033700fbb476bbad536fdd61d99f1c3b5 Mon Sep 17 00:00:00 2001
From: Kyle Farnung <kfarnung@microsoft.com>
Date: Wed, 24 May 2017 15:45:33 -0700
Subject: [PATCH] build: fix ARM build

Several fixes needed:
1. Don't pass in the platform to ChakraCore-
   it'll figure out the right SDK version
2. Disable intl on ARM if cross-compiling
3. Set the default SDK version if compiling ARM to
   be v10.0 since Node doesn't seem to compile for
   Windows on ARM with the older SDKs.
---
 configure                      | 3 +++
 deps/chakrashim/chakracore.gyp | 4 ----
 vcbuild.bat                    | 7 +++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index c16ee257431..ce0e2d13758 100755
--- a/configure
+++ b/configure
@@ -787,6 +787,9 @@ def configure_arm(o):
 
   o['variables']['arm_fpu'] = options.arm_fpu or arm_fpu
 
+  if flavor == 'win':
+    o['msvs_windows_sdk_version'] = 'v10.0'
+
 
 def configure_mips(o):
   can_use_fpu_instructions = (options.mips_float_abi != 'soft')
diff --git a/deps/chakrashim/chakracore.gyp b/deps/chakrashim/chakracore.gyp
index 9afdaade91a..b49e014f805 100644
--- a/deps/chakrashim/chakracore.gyp
+++ b/deps/chakrashim/chakracore.gyp
@@ -4,7 +4,6 @@
     'library%': 'static_library',   # build chakracore as static library or dll
     'component%': 'static_library', # link crt statically or dynamically
     'chakra_dir%': 'core',
-    'msvs_windows_target_platform_version_prop': '',
     'icu_args%': '',
     'icu_include_path%': '',
     'linker_start_group%': '',
@@ -19,8 +18,6 @@
       ['target_arch=="x64"', { 'Platform': 'x64' }],
       ['target_arch=="arm"', {
         'Platform': 'arm',
-        'msvs_windows_target_platform_version_prop':
-          '/p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion)',
       }],
       ['OS!="win"', {
         'icu_include_path': '../<(icu_path)/source/common'
@@ -113,7 +110,6 @@
                 '/p:Configuration=$(ConfigurationName)',
                 '/p:RuntimeLib=<(component)',
                 '/p:AdditionalPreprocessorDefinitions=COMPILE_DISABLE_Simdjs=1',
-                '<(msvs_windows_target_platform_version_prop)',
                 '/m',
                 '<@(_inputs)',
               ],
diff --git a/vcbuild.bat b/vcbuild.bat
index 6cb124d5eaf..fb8f6cdb9ab 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -143,6 +143,13 @@ if "%i18n_arg%"=="intl-none" set configure_flags=%configure_flags% --with-intl=n
 if "%i18n_arg%"=="without-intl" set configure_flags=%configure_flags% --without-intl
 if "%engine%"=="chakracore" set configure_flags=%configure_flags% --without-bundled-v8&set chakra_jslint=deps\chakrashim\lib
 
+if "%target_arch%"=="arm" (
+  if "%PROCESSOR_ARCHITECTURE%" NEQ "ARM" (
+    echo Skipping building ARM with Intl on a non-ARM device
+    set configure_flags=%configure_flags% --without-intl
+  )
+)
+
 if defined config_flags set configure_flags=%configure_flags% %config_flags%
 
 if not exist "%~dp0deps\icu" goto no-depsicu