Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 262f7e0

Browse files
committed
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. PR-URL: #265 Reviewed-By: Kunal Pathak <kunal.pathak@microsoft.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Hitesh Kanwathirtha <hiteshk@microsoft.com>
1 parent 32f5986 commit 262f7e0

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

configure

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,9 @@ def configure_arm(o):
787787

788788
o['variables']['arm_fpu'] = options.arm_fpu or arm_fpu
789789

790+
if flavor == 'win':
791+
o['msvs_windows_sdk_version'] = 'v10.0'
792+
790793

791794
def configure_mips(o):
792795
can_use_fpu_instructions = (options.mips_float_abi != 'soft')

deps/chakrashim/chakracore.gyp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
'library%': 'static_library', # build chakracore as static library or dll
55
'component%': 'static_library', # link crt statically or dynamically
66
'chakra_dir%': 'core',
7-
'msvs_windows_target_platform_version_prop': '',
87
'icu_args%': '',
98
'icu_include_path%': '',
109
'linker_start_group%': '',
@@ -19,8 +18,6 @@
1918
['target_arch=="x64"', { 'Platform': 'x64' }],
2019
['target_arch=="arm"', {
2120
'Platform': 'arm',
22-
'msvs_windows_target_platform_version_prop':
23-
'/p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion)',
2421
}],
2522
['OS!="win"', {
2623
'icu_include_path': '../<(icu_path)/source/common'
@@ -113,7 +110,6 @@
113110
'/p:Configuration=$(ConfigurationName)',
114111
'/p:RuntimeLib=<(component)',
115112
'/p:AdditionalPreprocessorDefinitions=COMPILE_DISABLE_Simdjs=1',
116-
'<(msvs_windows_target_platform_version_prop)',
117113
'/m',
118114
'<@(_inputs)',
119115
],

vcbuild.bat

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,13 @@ if "%i18n_arg%"=="intl-none" set configure_flags=%configure_flags% --with-intl=n
143143
if "%i18n_arg%"=="without-intl" set configure_flags=%configure_flags% --without-intl
144144
if "%engine%"=="chakracore" set configure_flags=%configure_flags% --without-bundled-v8&set chakra_jslint=deps\chakrashim\lib
145145

146+
if "%target_arch%"=="arm" (
147+
if "%PROCESSOR_ARCHITECTURE%" NEQ "ARM" (
148+
echo Skipping building ARM with Intl on a non-ARM device
149+
set configure_flags=%configure_flags% --without-intl
150+
)
151+
)
152+
146153
if defined config_flags set configure_flags=%configure_flags% %config_flags%
147154

148155
if not exist "%~dp0deps\icu" goto no-depsicu

0 commit comments

Comments
 (0)