summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/src/ctypes/moz.build26
-rw-r--r--js/src/moz.build19
2 files changed, 16 insertions, 29 deletions
diff --git a/js/src/ctypes/moz.build b/js/src/ctypes/moz.build
deleted file mode 100644
index 5bea399f37..0000000000
--- a/js/src/ctypes/moz.build
+++ /dev/null
@@ -1,26 +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 += [
- 'CTypes.cpp',
- 'Library.cpp',
-]
-
-if not CONFIG['MOZ_SYSTEM_FFI']:
- LOCAL_INCLUDES += [
- '!libffi/include',
- 'libffi/src/%s' % CONFIG['FFI_TARGET_DIR'],
- ]
-
-if CONFIG['_MSC_VER'] and CONFIG['CPU_ARCH'] == 'x86_64':
- SOURCES['CTypes.cpp'].no_pgo = True # Bug 810661 \ No newline at end of file
diff --git a/js/src/moz.build b/js/src/moz.build
index cf9f994e8a..f64e607bf8 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -125,9 +125,6 @@ if CONFIG['JS_NEW_REGEXP']:
if not CONFIG['JS_DISABLE_SHELL']:
DIRS += ['shell']
-if CONFIG['JS_HAS_CTYPES']:
- DIRS += ['ctypes']
-
SOURCES += [
'jsalloc.cpp',
'jsapi.cpp',
@@ -236,6 +233,17 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
'vm/TraceLoggingTypes.cpp',
]
+if CONFIG['JS_HAS_CTYPES']:
+ SOURCES += [
+ 'ctypes/CTypes.cpp',
+ 'ctypes/Library.cpp',
+ ]
+ if not CONFIG['MOZ_SYSTEM_FFI']:
+ LOCAL_INCLUDES += [
+ '!ctypes/libffi/include',
+ 'ctypes/libffi/src/%s' % CONFIG['FFI_TARGET_DIR'],
+ ]
+
if CONFIG['MOZ_VTUNE']:
SOURCES += [
'vtune/jitprofiling.c'
@@ -276,6 +284,11 @@ USE_LIBS += [
'zlib',
]
+
+if CONFIG['_MSC_VER']:
+ if CONFIG['CPU_ARCH'] == 'x86_64' and CONFIG['JS_HAS_CTYPES']:
+ SOURCES['ctypes/CTypes.cpp'].no_pgo = True # Bug 810661
+
if CONFIG['OS_ARCH'] not in ('WINNT'):
OS_LIBS += ['m']