wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge m-c to m-i

Browse Source
This commit is contained in:
Phil Ringnalda 2013-03-17 17:14:58 -07:00
commit 8423cc2cfc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/ion/AsmJS.cpp
View File

@ -4985,7 +4985,7 @@ js::CompileAsmJS(JSContext *cx, TokenStream &ts, ParseNode *fn, HandleScript scr
return Warn(cx, JSMSG_USE_ASM_TYPE_OK);
#else
return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Platform not supported");
return Warn(cx, JSMSG_USE_ASM_TYPE_FAIL, "Platform not supported (yet)");
#endif
}

2
js/src/ion/AsmJS.h
View File

@ -13,7 +13,7 @@
#if defined(JS_ION) && \
!defined(ANDROID) && \
(defined(JS_CPU_X86) || defined(JS_CPU_X64)) && \
(defined(__linux__) || defined(XP_WIN) || defined(XP_MACOSX))
(defined(__linux__) || defined(XP_WIN))
# define JS_ASMJS
#endif

6
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -244,10 +244,10 @@ class RecursiveMakeBackend(BuildBackend):
if obj.test_dirs:
fh.write('TEST_DIRS := %s\n' % ' '.join(obj.test_dirs))
if obj.test_tool_dirs:
fh.write('ifdef ENABLE_TESTS\n')
if obj.test_tool_dirs and \
self.environment.substs.get('ENABLE_TESTS', False):
fh.write('TOOL_DIRS += %s\n' % ' '.join(obj.test_tool_dirs))
fh.write('endif\n')
if len(obj.external_make_dirs):
fh.write('DIRS += %s\n' % ' '.join(obj.external_make_dirs))