build/common.gypi - Issue 11035053: Rollback trunk to bleeding_edge revision 12525

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/common.gypi

Issue 11035053: Rollback trunk to bleeding_edge revision 12525 (Closed) Base URL: https://v8.googlecode.com/svn/trunk

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:

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 125809db52820e9407a0c1ea7ba42b178e436b9f..89a02b6e5db87fd230ed881f08c53a1ba42dc903 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -302,14 +302,9 @@

['_toolset=="target"', {

'variables': {

'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',

- 'clang%': 0,

- 'conditions': [

- ['OS!="android" or clang==1', {

- 'cflags': [ '<(m32flag)' ],

- 'ldflags': [ '<(m32flag)' ],

- }],

- ],

+ 'cflags': [ '<(m32flag)' ],

+ 'ldflags': [ '<(m32flag)' ],

'xcode_settings': {

'ARCHS': [ 'i386' ],

« no previous file with comments | « Makefile ('k') | src/arm/assembler-arm.h » ('j') | no next file with comments »