build/toolchain.gypi - Issue 212863007: Modify toolchain.gypi to avoid adding -m64 flag on android.

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/toolchain.gypi

Issue 212863007: Modify toolchain.gypi to avoid adding -m64 flag on android. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: build/toolchain.gypi

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

index 5783529abcf36a4eb34bc30d73e998547432e1d0..4a70d6f7a719cdc6c39859996ed1a4f48cbbccca 100644

--- a/build/toolchain.gypi

+++ b/build/toolchain.gypi

@@ -428,8 +428,12 @@

'variables': {

'm64flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',

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

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

+ 'conditions': [

+ ['((OS!="android" and OS!="qnx") or clang==1)', {

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

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

+ }],

+ ],

}]

}],

« no previous file with comments | « no previous file | no next file » | no next file with comments »