OLD | NEW |
1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
4 # met: | 4 # met: |
5 # | 5 # |
6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 ['target_arch=="mipsel"', { | 177 ['target_arch=="mipsel"', { |
178 'ldflags': [ | 178 'ldflags': [ |
179 '-L<(android_stlport_libs)/mips', | 179 '-L<(android_stlport_libs)/mips', |
180 ], | 180 ], |
181 }], | 181 }], |
182 ['target_arch=="ia32"', { | 182 ['target_arch=="ia32"', { |
183 'ldflags': [ | 183 'ldflags': [ |
184 '-L<(android_stlport_libs)/x86', | 184 '-L<(android_stlport_libs)/x86', |
185 ], | 185 ], |
186 }], | 186 }], |
| 187 ['target_arch=="x64"', { |
| 188 'ldflags': [ |
| 189 '-L<(android_stlport_libs)/x86_64', |
| 190 ], |
| 191 }], |
187 ['target_arch=="arm64"', { | 192 ['target_arch=="arm64"', { |
188 'ldflags': [ | 193 'ldflags': [ |
189 '-L<(android_stlport_libs)/arm64', | 194 '-L<(android_stlport_libs)/arm64', |
190 ], | 195 ], |
191 }], | 196 }], |
192 ], | 197 ], |
193 }], | 198 }], |
194 ['target_arch=="ia32"', { | 199 ['target_arch=="ia32"', { |
195 # The x86 toolchain currently has problems with stack-protector. | 200 # The x86 toolchain currently has problems with stack-protector. |
196 'cflags!': [ | 201 'cflags!': [ |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 ['_type=="static_library"', { | 250 ['_type=="static_library"', { |
246 'ldflags': [ | 251 'ldflags': [ |
247 # Don't export symbols from statically linked libraries. | 252 # Don't export symbols from statically linked libraries. |
248 '-Wl,--exclude-libs=ALL', | 253 '-Wl,--exclude-libs=ALL', |
249 ], | 254 ], |
250 }], | 255 }], |
251 ], | 256 ], |
252 }], # _toolset=="target" | 257 }], # _toolset=="target" |
253 # Settings for building host targets using the system toolchain. | 258 # Settings for building host targets using the system toolchain. |
254 ['_toolset=="host"', { | 259 ['_toolset=="host"', { |
255 'cflags': [ '-m32', '-pthread' ], | 260 'conditions': [ |
256 'ldflags': [ '-m32', '-pthread' ], | 261 ['target_arch=="x64"', { |
| 262 'cflags': [ '-m64', '-pthread' ], |
| 263 'ldflags': [ '-m64', '-pthread' ], |
| 264 }, { |
| 265 'cflags': [ '-m32', '-pthread' ], |
| 266 'ldflags': [ '-m32', '-pthread' ], |
| 267 }], |
| 268 ], |
257 'ldflags!': [ | 269 'ldflags!': [ |
258 '-Wl,-z,noexecstack', | 270 '-Wl,-z,noexecstack', |
259 '-Wl,--gc-sections', | 271 '-Wl,--gc-sections', |
260 '-Wl,-O1', | 272 '-Wl,-O1', |
261 '-Wl,--as-needed', | 273 '-Wl,--as-needed', |
262 ], | 274 ], |
263 }], | 275 }], |
264 ], # target_conditions | 276 ], # target_conditions |
265 }, # target_defaults | 277 }, # target_defaults |
266 } | 278 } |
OLD | NEW |