Bug 1023753 - Define JSGC_FJGENERATIONAL only if JS_THREADSAFE. r=ted

This commit is contained in:
Lars T Hansen 2014-06-12 23:12:12 +02:00
parent 76d6cb6ccf
commit 208323a62c
2 changed files with 4 additions and 3 deletions

View File

@ -2791,6 +2791,8 @@ MOZ_ARG_DISABLE_BOOL(threadsafe,
if test -n "$JS_THREADSAFE"; then
AC_DEFINE(JS_THREADSAFE)
fi
JS_THREADSAFE_CONFIGURED=$JS_THREADSAFE
AC_SUBST(JS_THREADSAFE_CONFIGURED)
if test "$_USE_SYSTEM_NSPR" || (test "$NSPR_CFLAGS" -o "$NSPR_LIBS"); then
_HAS_NSPR=1

View File

@ -458,8 +458,7 @@ if CONFIG['NIGHTLY_BUILD']:
DEFINES['ENABLE_PARALLEL_JS'] = True
DEFINES['ENABLE_BINARYDATA'] = True
DEFINES['ENABLE_SHARED_ARRAY_BUFFER'] = True
if CONFIG['ENABLE_ION']:
if CONFIG['JSGC_GENERATIONAL_CONFIGURED']:
if CONFIG['ENABLE_ION'] and CONFIG['JSGC_GENERATIONAL_CONFIGURED'] and CONFIG['JS_THREADSAFE_CONFIGURED']:
DEFINES['JSGC_FJGENERATIONAL'] = True
DEFINES['EXPORT_JS_API'] = True