From 17880c3f7528ef180712df419d4879e5ef2cc192 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 10 Sep 2019 15:15:20 -0400 Subject: [PATCH 1/2] build: handle arm64 node headers (cherry picked from commit ff1f224d96fbbd0d745483d48a7ee55dc80f8add) --- script/release/uploaders/upload-node-headers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/release/uploaders/upload-node-headers.py b/script/release/uploaders/upload-node-headers.py index 369ab72dd2135..f19491082f4c2 100755 --- a/script/release/uploaders/upload-node-headers.py +++ b/script/release/uploaders/upload-node-headers.py @@ -55,6 +55,10 @@ def upload_node(bucket, access_key, secret_key, version): node_lib = os.path.join(DIST_DIR, 'node.lib') iojs_lib = os.path.join(DIST_DIR, 'win-x86', 'iojs.lib') v4_node_lib = os.path.join(DIST_DIR, 'win-x86', 'node.lib') + elif get_target_arch() == 'arm64': + node_lib = os.path.join(DIST_DIR, 'node.lib') + iojs_lib = os.path.join(DIST_DIR, 'win-arm64', 'iojs.lib') + v4_node_lib = os.path.join(DIST_DIR, 'win-arm64', 'node.lib') else: node_lib = os.path.join(DIST_DIR, 'x64', 'node.lib') iojs_lib = os.path.join(DIST_DIR, 'win-x64', 'iojs.lib') From a699c2164dcd52e8e7fb2ca55bf35c62f88dd80b Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 10 Sep 2019 15:27:34 -0400 Subject: [PATCH 2/2] node.lib for arm64 needs to go to specific dir --- script/release/uploaders/upload-node-headers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/release/uploaders/upload-node-headers.py b/script/release/uploaders/upload-node-headers.py index f19491082f4c2..0f81504fe117c 100755 --- a/script/release/uploaders/upload-node-headers.py +++ b/script/release/uploaders/upload-node-headers.py @@ -56,7 +56,7 @@ def upload_node(bucket, access_key, secret_key, version): iojs_lib = os.path.join(DIST_DIR, 'win-x86', 'iojs.lib') v4_node_lib = os.path.join(DIST_DIR, 'win-x86', 'node.lib') elif get_target_arch() == 'arm64': - node_lib = os.path.join(DIST_DIR, 'node.lib') + node_lib = os.path.join(DIST_DIR, 'arm64', 'node.lib') iojs_lib = os.path.join(DIST_DIR, 'win-arm64', 'iojs.lib') v4_node_lib = os.path.join(DIST_DIR, 'win-arm64', 'node.lib') else: