|
9 | 9 | 'conditions': [ |
10 | 10 | ['enable_lto=="true"', { |
11 | 11 | 'cflags': ['<(lto)'], |
12 | | -@@ -506,64 +506,6 @@ |
| 12 | +@@ -506,56 +506,6 @@ |
13 | 13 | 'cflags': [ '-I/usr/local/include' ], |
14 | 14 | 'ldflags': [ '-Wl,-z,wxneeded' ], |
15 | 15 | }], |
|
23 | 23 | - 'cflags': [ '-m64' ], |
24 | 24 | - 'ldflags': [ '-m64' ], |
25 | 25 | - }], |
26 | | -- [ 'host_arch=="ppc" and OS not in "aix os400"', { |
27 | | -- 'cflags': [ '-m32' ], |
28 | | -- 'ldflags': [ '-m32' ], |
29 | | -- }], |
30 | 26 | - [ 'host_arch=="ppc64" and OS not in "aix os400"', { |
31 | 27 | - 'conditions': [ |
32 | 28 | - [ 'clang==0', { |
|
52 | 48 | - 'cflags': [ '-m64' ], |
53 | 49 | - 'ldflags': [ '-m64' ], |
54 | 50 | - }], |
55 | | -- [ 'target_arch=="ppc" and OS not in "aix os400"', { |
56 | | -- 'cflags': [ '-m32' ], |
57 | | -- 'ldflags': [ '-m32' ], |
58 | | -- }], |
59 | 51 | - [ 'target_arch=="ppc64" and OS not in "aix os400"', { |
60 | 52 | - 'conditions': [ |
61 | 53 | - [ 'clang==0', { |
|
86 | 78 | master_ninja.variable("cl_" + arch, command) |
87 | 79 |
|
88 | 80 | cc = GetEnvironFallback(["CC_target", "CC"], cc) |
89 | | ---- node-v22.13.0/tools/v8_gypfiles/toolchain.gypi~ 2025-01-06 22:51:52.000000000 +0100 |
90 | | -+++ node-v22.13.0/tools/v8_gypfiles/toolchain.gypi 2025-02-11 10:30:08.699993924 +0100 |
91 | | -@@ -607,65 +607,17 @@ |
92 | | - v8_target_arch=="ppc")', { |
93 | | - 'target_conditions': [ |
94 | | - ['_toolset=="host"', { |
95 | | -- 'conditions': [ |
96 | | -- ['host_cxx_is_biarch==1', { |
97 | | -- 'conditions': [ |
98 | | -- ['host_arch=="s390x"', { |
99 | | -- 'cflags': [ '-m31' ], |
100 | | -- 'ldflags': [ '-m31' ] |
101 | | -- },{ |
102 | | -- 'cflags': [ '-m32' ], |
103 | | -- 'ldflags': [ '-m32' ] |
104 | | -- }], |
105 | | -- ], |
106 | | -- }], |
107 | | -- ], |
108 | | - 'xcode_settings': { |
109 | | - 'ARCHS': [ 'i386' ], |
110 | | - }, |
111 | | - }], |
112 | | - ['_toolset=="target"', { |
113 | | -- 'conditions': [ |
114 | | -- ['target_cxx_is_biarch==1', { |
115 | | -- 'conditions': [ |
116 | | -- ['host_arch=="s390x"', { |
117 | | -- 'cflags': [ '-m31' ], |
118 | | -- 'ldflags': [ '-m31' ] |
119 | | -- },{ |
120 | | -- 'cflags': [ '-m32' ], |
121 | | -- 'ldflags': [ '-m32' ], |
122 | | -- }], |
123 | | -- ], |
124 | | -- }], |
125 | | -- ], |
126 | | - 'xcode_settings': { |
127 | | - 'ARCHS': [ 'i386' ], |
128 | | - }, |
129 | | - }], |
130 | | - ], |
131 | | - }], |
132 | | -- ['(OS=="linux" or OS=="android") and \ |
133 | | -- (v8_target_arch=="x64" or v8_target_arch=="arm64" or \ |
134 | | -- v8_target_arch=="ppc64" or v8_target_arch=="s390x")', { |
135 | | -- 'target_conditions': [ |
136 | | -- ['_toolset=="host"', { |
137 | | -- 'conditions': [ |
138 | | -- ['host_cxx_is_biarch==1', { |
139 | | -- 'cflags': [ '-m64' ], |
140 | | -- 'ldflags': [ '-m64' ] |
141 | | -- }], |
142 | | -- ], |
143 | | -- }], |
144 | | -- ['_toolset=="target"', { |
145 | | -- 'conditions': [ |
146 | | -- ['target_cxx_is_biarch==1', { |
147 | | -- 'cflags': [ '-m64' ], |
148 | | -- 'ldflags': [ '-m64' ], |
149 | | -- }], |
150 | | -- ] |
151 | | -- }], |
152 | | -- ], |
153 | | -- }], |
154 | | - ['OS=="android" and v8_android_log_stdout==1', { |
155 | | - 'defines': [ |
156 | | - 'V8_ANDROID_LOG_STDOUT', |
0 commit comments