gyp/opts.gyp - 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/opts.gyp

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/opts.gyp

diff --git a/gyp/opts.gyp b/gyp/opts.gyp

index 2fb1468f502ce8c05b1bb755033118d826c6b56d..6ff900863c801019dc569ff46130dc3c02a37760 100644

--- a/gyp/opts.gyp

+++ b/gyp/opts.gyp

@@ -1,3 +1,4 @@

+# Gyp file for building opts target.

{

# Source lists live in opts.gypi. This makes it easier to maintain our Chrome GYP/GN setup.

# (To be honest, I'm not sure why we need to include common.gypi. I thought it was automatic.)

@@ -26,7 +27,7 @@

'../include/utils',

'conditions': [

- [ 'skia_arch_type == "x86" and skia_os != "ios"', {

+ [ '"x86" in skia_arch_type and skia_os != "ios"', {

'cflags': [ '-msse2' ],

'dependencies': [ 'opts_ssse3', 'opts_sse41' ],

'sources': [ '<@(sse2_sources)' ],

@@ -44,7 +45,9 @@

[ '(skia_arch_type == "arm" and arm_version < 7) \

or (skia_os == "ios") \

- or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {

+ or (skia_os == "android" \

+ and skia_arch_type not in ["x86", "x86_64", "arm", "mips", \

+ "arm64"])', {

'sources': [ '<@(none_sources)' ],

}],

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