Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: build/common.gypi

Issue 10990070: Not set -m32 flag when compiling with Android ARM compiler. (Closed) Base URL: http://git.chromium.org/external/v8.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 'cflags': [ '<(m32flag)' ], 296 'cflags': [ '<(m32flag)' ],
297 'ldflags': [ '<(m32flag)' ], 297 'ldflags': [ '<(m32flag)' ],
298 'xcode_settings': { 298 'xcode_settings': {
299 'ARCHS': [ 'i386' ], 299 'ARCHS': [ 'i386' ],
300 }, 300 },
301 }], 301 }],
302 ['_toolset=="target"', { 302 ['_toolset=="target"', {
303 'variables': { 303 'variables': {
304 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', 304 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
305 }, 305 },
306 'cflags': [ '<(m32flag)' ], 306 'conditions': [
307 'ldflags': [ '<(m32flag)' ], 307 [ 'OS!="android" or clang==1', {
Jakob Kummerow 2012/09/28 14:38:33 |clang| is not defined when building outside of Ch
308 'cflags': [ '<(m32flag)' ],
Jakob Kummerow 2012/09/28 14:38:33 nit: indentation
309 'ldflags': [ '<(m32flag)' ],
310 }],
311 ],
308 'xcode_settings': { 312 'xcode_settings': {
309 'ARCHS': [ 'i386' ], 313 'ARCHS': [ 'i386' ],
310 }, 314 },
311 }], 315 }],
312 ], 316 ],
313 }], 317 }],
314 ['OS=="freebsd" or OS=="openbsd"', { 318 ['OS=="freebsd" or OS=="openbsd"', {
315 'cflags': [ '-I/usr/local/include' ], 319 'cflags': [ '-I/usr/local/include' ],
316 }], 320 }],
317 ['OS=="netbsd"', { 321 ['OS=="netbsd"', {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 'OptimizeReferences': '2', 425 'OptimizeReferences': '2',
422 'EnableCOMDATFolding': '2', 426 'EnableCOMDATFolding': '2',
423 }, 427 },
424 }, 428 },
425 }], # OS=="win" 429 }], # OS=="win"
426 ], # conditions 430 ], # conditions
427 }, # Release 431 }, # Release
428 }, # configurations 432 }, # configurations
429 }, # target_defaults 433 }, # target_defaults
430 } 434 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698