diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-01-24 12:02:42 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-01-24 12:02:42 -0800 |
| commit | 64c779641a2a9587613cc65ad7251890f18e25c3 (patch) | |
| tree | 87344a57db509e92b3196e5a4291a8c3bd8c2449 /tools/shared.py | |
| parent | 4e09482e006eda934527e1707036d74245d8dd91 (diff) | |
| parent | 03e2e6c321d28e3df3b37a2c0bed3ba9d04e52b3 (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'tools/shared.py')
| -rw-r--r-- | tools/shared.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/shared.py b/tools/shared.py index a78db8e0..f94bb263 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -344,10 +344,12 @@ try: except: COMPILER_OPTS = [] # Force a simple, standard target as much as possible: target 32-bit linux, and disable various flags that hint at other platforms +# -fno-ms-compatibility is passed, since on Windows, Clang enables a 'MS compatibility mode' by default, that disables char16_t and char32_t +# to be MSVC header -compatible. This would cause build errors in libcxx file __config. COMPILER_OPTS = COMPILER_OPTS + ['-m32', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-Ui386', '-Ux86_64', '-U__SSE__', '-U__SSE2__', '-U__MMX__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87', '-DEMSCRIPTEN', '-U__STRICT_ANSI__', '-U__CYGWIN__', - '-D__STDC__', '-Xclang', '-triple=i386-pc-linux-gnu', '-D__IEEE_LITTLE_ENDIAN', '-fno-math-errno'] - + '-D__STDC__', '-Xclang', '-triple=i386-pc-linux-gnu', '-D__IEEE_LITTLE_ENDIAN', '-fno-math-errno', + '-fno-ms-compatibility'] USE_EMSDK = not os.environ.get('EMMAKEN_NO_SDK') |