gyp/common_conditions.gypi - Issue 916113002: Don't use m32 cflag for x86_64.

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: gyp/common_conditions.gypi

Issue 916113002: Don't use m32 cflag for x86_64. (Closed) Base URL: https://skia.googlesource.com/skia.git@baselijne

Patch Set: Make desktops distinguish between x86 and x86_64 Created 5 years, 10 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: gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi

index 15db2a61e89aba36c4d725677144e15cb0f3cfff..29df10d897689ccde688382803e79ae531b5b8e4 100644

--- a/gyp/common_conditions.gypi

+++ b/gyp/common_conditions.gypi

@@ -227,7 +227,7 @@

'conditions': [

[ 'skia_os != "chromeos"', {

'conditions': [

- [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {

+ [ 'skia_arch_type == "x86_64"', {

'cflags': [

'-m64',

@@ -235,7 +235,7 @@

'-m64',

}],

- [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {

+ [ 'skia_arch_type == "x86"', {

'cflags': [

'-m32',

@@ -628,7 +628,7 @@

'-fuse-ld=gold',

'conditions': [

- [ 'skia_arch_type == "x86"', {

+ [ '"x86" in skia_arch_type', {

'cflags': [

'-mssse3',

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