diff options
author | Matt A. Tobin <email@mattatobin.com> | 2020-11-04 15:03:13 -0500 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2020-11-04 15:03:42 -0500 |
commit | bc68570e1ee4f043d28f7e5c407af9fa0920aabb (patch) | |
tree | 50c32b06b454e91a58fb1c8c4a4d2e759e09cea9 /js | |
parent | 1de3a3f860fe20a1d26f78cb9c98af276c67b1cc (diff) | |
download | uxp-bc68570e1ee4f043d28f7e5c407af9fa0920aabb.tar.gz |
Issue mcp-graveyard/UXP#1676 - Part 20: Split vtune sources out of js/src/moz.build
Diffstat (limited to 'js')
-rw-r--r-- | js/src/moz.build | 12 | ||||
-rw-r--r-- | js/src/vtune/moz.build | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index 20c1e57226..f9e5233a9f 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -116,14 +116,17 @@ DIRS += [ 'wasm', ] +if CONFIG['JS_HAS_CTYPES']: + DIRS += ['ctypes'] + if CONFIG['JS_BUNDLED_EDITLINE']: DIRS += ['editline'] if not CONFIG['JS_DISABLE_SHELL']: DIRS += ['shell'] -if CONFIG['JS_HAS_CTYPES']: - DIRS += ['ctypes'] +if CONFIG['MOZ_VTUNE']: + DIRS += ['vtune'] SOURCES += [ 'jsalloc.cpp', @@ -233,11 +236,6 @@ if CONFIG['ENABLE_TRACE_LOGGING']: 'vm/TraceLoggingTypes.cpp', ] -if CONFIG['MOZ_VTUNE']: - SOURCES += [ - 'vtune/jitprofiling.c' - ] - # JavaScript must be built shared, even for static builds, as it is used by # other modules which are always built shared. Failure to do so results in # the js code getting copied into xpinstall and jsd as well as mozilla-bin, diff --git a/js/src/vtune/moz.build b/js/src/vtune/moz.build new file mode 100644 index 0000000000..4659197958 --- /dev/null +++ b/js/src/vtune/moz.build @@ -0,0 +1,14 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +include('../js-config.mozbuild') +include('../js-cxxflags.mozbuild') + +FINAL_LIBRARY = "js" + +# Includes should be relative to parent path +LOCAL_INCLUDES += ["!..", ".."] + +SOURCES += ['jitprofiling.c']
\ No newline at end of file |