1 files changed, 16 insertions, 3 deletions
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']