summaryrefslogtreecommitdiffstats
path: root/skia/BUILD.gn
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-06-05 10:54:16 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-05 17:54:41 +0000
commitbb9d67e7b77484c4fa2a653c0f89b60cc3f894de (patch)
tree26abf1eb40c84ce7c102cb25b074bb8974689b4b /skia/BUILD.gn
parent1a4282180660fce54726f648ac465afea227109c (diff)
downloadchromium_src-bb9d67e7b77484c4fa2a653c0f89b60cc3f894de.zip
chromium_src-bb9d67e7b77484c4fa2a653c0f89b60cc3f894de.tar.gz
chromium_src-bb9d67e7b77484c4fa2a653c0f89b60cc3f894de.tar.bz2
clang/win/gn: Pass -msse flags to clang-cl.exe for skia
This is a port of https://codereview.chromium.org/475273002 to gn. Also add a comment that explains that the skia_opts target in the GN build isn't correct. BUG=491209,82385,496512 Review URL: https://codereview.chromium.org/1155243010 Cr-Commit-Position: refs/heads/master@{#333091}
Diffstat (limited to 'skia/BUILD.gn')
-rw-r--r--skia/BUILD.gn6
1 files changed, 4 insertions, 2 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 29ad879..5fedacf 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -545,6 +545,7 @@ component("skia") {
}
# Separated out so it can be compiled with different flags for SSE.
+# TODO(GYP): This is wrong, it needs one target per arch http://crbug.com/496512
source_set("skia_opts") {
cflags = []
defines = []
@@ -558,9 +559,10 @@ source_set("skia_opts") {
"ext/convolver_SSE2.h",
]
- if (is_linux || is_mac) {
+ if (!is_win || is_clang) {
cflags += [ "-msse4.1" ]
- } else if (is_win) {
+ }
+ if (is_win) {
defines += [ "SK_CPU_SSE_LEVEL=41" ]
}
} else if (current_cpu == "arm") {