build/android.gypi - Issue 393273002: Revert "Remove erroneous uses of CXX / CXX_target / CXX_host from gyp."

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

Issue 393273002: Revert "Remove erroneous uses of CXX / CXX_target / CXX_host from gyp." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 5 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/android.gypi

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

index e5b87198097646058064c22ecfe320f81b02610d..098109eb3ed751307c058079213363e0fe067acb 100644

--- a/build/android.gypi

+++ b/build/android.gypi

@@ -265,8 +265,15 @@

}], # _toolset=="target"

# Settings for building host targets using the system toolchain.

['_toolset=="host"', {

- 'cflags': [ '-pthread' ],

- 'ldflags': [ '-pthread' ],

+ 'conditions': [

+ ['target_arch=="x64"', {

+ 'cflags': [ '-m64', '-pthread' ],

+ 'ldflags': [ '-m64', '-pthread' ],

+ }, {

+ 'cflags': [ '-m32', '-pthread' ],

+ 'ldflags': [ '-m32', '-pthread' ],

+ }],

+ ],

'ldflags!': [

'-Wl,-z,noexecstack',

'-Wl,--gc-sections',

« no previous file with comments | « no previous file | build/toolchain.gypi » ('j') | no next file with comments »