Closed
Description
I'm experimenting with Visual Studio's Clang support and have an issue with ICU:
There's only one line with an error while building tools\icu\icudata.vcxproj
..\..\out\Release\\obj\global_intermediate\icudt67l_dat.obj: unknown machine: 0
/cc @srl295
Diff to get there
diff --git a/deps/zlib/adler32_simd.c b/deps/zlib/adler32_simd.c
index f8b07297b93..d5b63727a48 100644
--- a/deps/zlib/adler32_simd.c
+++ b/deps/zlib/adler32_simd.c
@@ -50,7 +50,7 @@
#define NMAX 5552
#if defined(ADLER32_SIMD_SSSE3)
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__clang__)
#define __attribute__()
#endif
diff --git a/deps/zlib/crc32_simd.c b/deps/zlib/crc32_simd.c
index 27481847e97..4c5ab42701a 100644
--- a/deps/zlib/crc32_simd.c
+++ b/deps/zlib/crc32_simd.c
@@ -8,7 +8,7 @@
#include "crc32_simd.h"
#if defined(CRC32_SIMD_SSE42_PCLMUL)
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__clang__)
#define __attribute__()
#endif
diff --git a/deps/zlib/crc_folding.c b/deps/zlib/crc_folding.c
index 54f4b5c9401..1e4ec5de64c 100644
--- a/deps/zlib/crc_folding.c
+++ b/deps/zlib/crc_folding.c
@@ -21,9 +21,11 @@
#include <inttypes.h>
#include <emmintrin.h>
#include <immintrin.h>
+#include <smmintrin.h>
+#include <tmmintrin.h>
#include <wmmintrin.h>
-#ifndef __GNUC__
+#if !defined(__GNUC__) && !defined(__clang__)
#define __attribute__()
#endif
diff --git a/tools/gyp/pylib/gyp/generator/msvs.py b/tools/gyp/pylib/gyp/generator/msvs.py
index 09abadb1bcb..1c960aefca3 100644
--- a/tools/gyp/pylib/gyp/generator/msvs.py
+++ b/tools/gyp/pylib/gyp/generator/msvs.py
@@ -2799,7 +2799,7 @@ def _GetMSBuildLocalProperties(msbuild_toolset):
if msbuild_toolset:
properties = [
['PropertyGroup', {'Label': 'Locals'},
- ['PlatformToolset', msbuild_toolset],
+ ['PlatformToolset', 'ClangCL'],
]
]
return properties