diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-01-22 19:45:51 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-01-24 17:41:57 +0000 |
| commit | a7f0030f2c7d1d62e9aafb87934f6e81d40389ae (patch) | |
| tree | 8192bee0b4f3716871d7387628cf7fbca5523def | |
| parent | 5f717b43e808c71b7e5bc76e6e2086774a9f4978 (diff) | |
| download | qtwebengine-chromium-a7f0030f2c7d1d62e9aafb87934f6e81d40389ae.tar.gz | |
Add check for Xcode clang to fix building on macOS 10.12
Target attribute avx2 doesn't seem to work on older Apple
clangs.
Change-Id: If56fbb2e6ef72786527f2507ae70d01ba5182b35
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/skia/third_party/skcms/skcms.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/third_party/skia/third_party/skcms/skcms.cc b/chromium/third_party/skia/third_party/skcms/skcms.cc index 7884174a68c..57f86b59851 100644 --- a/chromium/third_party/skia/third_party/skcms/skcms.cc +++ b/chromium/third_party/skia/third_party/skcms/skcms.cc @@ -1881,7 +1881,8 @@ namespace baseline { // Now, instantiate any other versions of run_program() we may want for runtime detection. #if !defined(SKCMS_PORTABLE) && \ - (( defined(__clang__) && __clang_major__ >= 5) || \ + ((defined(__APPLE__) && defined(__apple_build_version__) && __clang_major__ >= 9) || \ + (!defined(__apple_build_version__) && defined(__clang__) && __clang_major__ >= 5) || \ (!defined(__clang__) && defined(__GNUC__))) \ && defined(__x86_64__) && !defined(__AVX2__) && !defined(__INTEL_COMPILER) |