Skip to content

Commit 50eeaa6

Browse files
author
Shigeki Ohtsu
committed
deps: move rules of win to top level in openssl.gyp
1 parent 695f4b2 commit 50eeaa6

File tree

1 file changed

+43
-38
lines changed

1 file changed

+43
-38
lines changed

deps/openssl/openssl.gyp

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,6 @@
4040
}, 'OS=="win"', {
4141
'defines': ['<@(openssl_defines_x86_win)'],
4242
'sources': ['<@(openssl_sources_x86_win32_masm)'],
43-
'rules': [
44-
{
45-
'rule_name': 'Assemble',
46-
'extension': 'asm',
47-
'inputs': [],
48-
'outputs': [
49-
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
50-
],
51-
'action': [
52-
'ml.exe',
53-
'/Zi',
54-
'/safeseh',
55-
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
56-
'/c', '<(RULE_INPUT_PATH)',
57-
],
58-
'process_outputs_as_sources': 0,
59-
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
60-
}
61-
],
6243
}, { # Linux or others
6344
'defines': ['<@(openssl_defines_x86_elf)'],
6445
'sources': ['<@(openssl_sources_x86_elf_gas)'],
@@ -73,24 +54,6 @@
7354
}, 'OS=="win"', {
7455
'defines': ['<@(openssl_defines_x64_win)'],
7556
'sources': ['<@(openssl_sources_x64_win32_masm)'],
76-
'rules': [
77-
{
78-
'rule_name': 'Assemble',
79-
'extension': 'asm',
80-
'inputs': [],
81-
'outputs': [
82-
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
83-
],
84-
'action': [
85-
'ml64.exe',
86-
'/Zi',
87-
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
88-
'/c', '<(RULE_INPUT_PATH)',
89-
],
90-
'process_outputs_as_sources': 0,
91-
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
92-
}
93-
],
9457
}, { # Linux or others
9558
'defines': ['<@(openssl_defines_x64_elf)'],
9659
'sources': ['<@(openssl_sources_x64_elf_gas)'],
@@ -105,7 +68,49 @@
10568
],
10669
}], # end of conditions of openssl_no_asm
10770
['OS=="win"', {
108-
'defines' : ['<@(openssl_defines_all_win)']
71+
'defines' : ['<@(openssl_defines_all_win)'],
72+
'conditions': [
73+
['target_arch=="ia32"', {
74+
'rules': [
75+
{
76+
'rule_name': 'Assemble',
77+
'extension': 'asm',
78+
'inputs': [],
79+
'outputs': [
80+
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
81+
],
82+
'action': [
83+
'ml.exe',
84+
'/Zi',
85+
'/safeseh',
86+
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
87+
'/c', '<(RULE_INPUT_PATH)',
88+
],
89+
'process_outputs_as_sources': 0,
90+
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
91+
}
92+
],
93+
}, 'target_arch=="x64"', {
94+
'rules': [
95+
{
96+
'rule_name': 'Assemble',
97+
'extension': 'asm',
98+
'inputs': [],
99+
'outputs': [
100+
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
101+
],
102+
'action': [
103+
'ml64.exe',
104+
'/Zi',
105+
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
106+
'/c', '<(RULE_INPUT_PATH)',
107+
],
108+
'process_outputs_as_sources': 0,
109+
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
110+
}
111+
],
112+
}],
113+
],
109114
}, {
110115
'defines' : ['<@(openssl_defines_all_non_win)']
111116
}]

0 commit comments

Comments
 (0)