summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/src/moz.build12
-rw-r--r--js/src/vtune/moz.build14
2 files changed, 7 insertions, 19 deletions
diff --git a/js/src/moz.build b/js/src/moz.build
index 2d10c859ec..cf9f994e8a 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -116,9 +116,6 @@ DIRS += [
'wasm',
]
-if CONFIG['JS_HAS_CTYPES']:
- DIRS += ['ctypes']
-
if CONFIG['JS_BUNDLED_EDITLINE']:
DIRS += ['editline']
@@ -128,8 +125,8 @@ if CONFIG['JS_NEW_REGEXP']:
if not CONFIG['JS_DISABLE_SHELL']:
DIRS += ['shell']
-if CONFIG['MOZ_VTUNE']:
- DIRS += ['vtune']
+if CONFIG['JS_HAS_CTYPES']:
+ DIRS += ['ctypes']
SOURCES += [
'jsalloc.cpp',
@@ -239,6 +236,11 @@ 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
deleted file mode 100644
index 4659197958..0000000000
--- a/js/src/vtune/moz.build
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- 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