diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-09-24 19:07:14 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-09-24 19:07:14 -0700 |
| commit | cc236543f303de318066976c57936109f063b311 (patch) | |
| tree | 8e3ebbaaf8fc617935a445428e39f6b0423ce50b | |
| parent | 1ea039eea38dad37c5b0c836cf98829bad6013ce (diff) | |
use libc++; cubescript passes
| -rw-r--r-- | system/include/libc/ctype.h | 2 | ||||
| -rw-r--r-- | tools/shared.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/system/include/libc/ctype.h b/system/include/libc/ctype.h index 56ad5abb..f478a56a 100644 --- a/system/include/libc/ctype.h +++ b/system/include/libc/ctype.h @@ -30,6 +30,7 @@ int _EXFUN(toascii, (int __c)); #define _toupper(__c) ((unsigned char)(__c) - 'a' + 'A') #endif +/* XXX Emscripten - these confuse libc++ #define _U 01 #define _L 02 #define _N 04 @@ -38,6 +39,7 @@ int _EXFUN(toascii, (int __c)); #define _C 040 #define _X 0100 #define _B 0200 +*/ #ifndef _MB_CAPABLE _CONST diff --git a/tools/shared.py b/tools/shared.py index 9abac9c4..75804746 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -27,7 +27,10 @@ EXEC_LLVM = path_from_root('tools', 'exec_llvm.py') # Additional compiler options -COMPILER_OPTS = COMPILER_OPTS + ['-m32', '-nostdinc', '-I' + path_from_root('system', 'include', 'libc'), '-v', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87'] +COMPILER_OPTS = COMPILER_OPTS + ['-m32', '-nostdinc', '-v', '-U__i386__', '-U__x86_64__', '-U__i386', '-U__x86_64', '-U__SSE__', '-U__SSE2__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87'] + [ + '-I' + path_from_root('system', 'include', 'libc'), + '-I' + path_from_root('system', 'include', 'libcxx'), +] # Engine tweaks |