diff options
Diffstat (limited to 'js/src/moz.build')
| -rw-r--r-- | js/src/moz.build | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index 6664007ad..865e964e1 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -131,18 +131,22 @@ if not CONFIG['JS_DISABLE_SHELL']: if CONFIG['MOZ_VTUNE']: DIRS += ['vtune'] -UNIFIED_SOURCES += [ +SOURCES += [ 'jsalloc.cpp', 'jsapi.cpp', + 'jsarray.cpp', + 'jsatom.cpp', 'jsbool.cpp', 'jscntxt.cpp', 'jscompartment.cpp', 'jsdate.cpp', + 'jsdtoa.cpp', 'jsexn.cpp', 'jsfriendapi.cpp', 'jsfun.cpp', 'jsgc.cpp', 'jsiter.cpp', + 'jsmath.cpp', 'jsnativestack.cpp', 'jsnum.cpp', 'jsobj.cpp', @@ -152,16 +156,8 @@ UNIFIED_SOURCES += [ 'jspropertytree.cpp', 'jsscript.cpp', 'jsstr.cpp', - 'jsweakmap.cpp', -] - -# Can't be built unified -SOURCES += [ - 'jsarray.cpp', - 'jsatom.cpp', - 'jsdtoa.cpp', - 'jsmath.cpp', 'jsutil.cpp', + 'jsweakmap.cpp', ] # Suppress warnings in third-party code. @@ -169,7 +165,7 @@ SOURCES += [ if CONFIG['CLANG_CXX'] or CONFIG['GNU_CXX']: SOURCES['jsdtoa.cpp'].flags += ['-Wno-implicit-fallthrough'] -UNIFIED_SOURCES += [ +SOURCES += [ 'vm/ArgumentsObject.cpp', 'vm/ArrayBufferObject.cpp', 'vm/AsyncFunction.cpp', @@ -189,6 +185,7 @@ UNIFIED_SOURCES += [ 'vm/GlobalObject.cpp', 'vm/HelperThreads.cpp', 'vm/Id.cpp', + 'vm/Initialization.cpp', 'vm/Interpreter.cpp', 'vm/JSONParser.cpp', 'vm/MemoryMetrics.cpp', @@ -230,18 +227,12 @@ UNIFIED_SOURCES += [ 'vm/Xdr.cpp', ] -# Can't be built unified -SOURCES += [ - 'vm/Initialization.cpp', -] - if CONFIG['JS_POSIX_NSPR']: - UNIFIED_SOURCES += [ + SOURCES += [ 'vm/PosixNSPR.cpp', ] if CONFIG['ENABLE_TRACE_LOGGING']: - # Can't be built unified SOURCES += [ 'vm/TraceLogging.cpp', 'vm/TraceLoggingGraph.cpp', @@ -305,5 +296,3 @@ OS_LIBS += CONFIG['REALTIME_LIBS'] NO_EXPAND_LIBS = True DIST_INSTALL = True - - |