Bug 958404 - Recurse ffi from top-level when building js. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 20 Jan 2014 09:11:55 +0900
changeset 164266 f7a650bc263ccbf55f6500fb18ee69218b9db66b
parent 164265 c8356a0b4158144bad2b4b6a968b2c6488e62c7f
child 164267 5d19bc17175cc1903517b2ac907995ff49cfb163
push id26032
push userMs2ger@gmail.com
push dateMon, 20 Jan 2014 08:32:37 +0000
treeherdermozilla-central@01ec0095e655 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs958404
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 958404 - Recurse ffi from top-level when building js. r=gps
js/src/Makefile.in
moz.build
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -139,30 +139,19 @@ ifdef ENABLE_INTL_API
                              cp -p $(DEPTH)/intl/icu/target/lib/s$(libname)$(ICU_LIB_SUFFIX).lib $(DEPTH)/intl/icu/target/lib/$(libname).lib;)
       endif
     endif # MOZ_SHARED_ICU
   endif # !MOZ_NATIVE_ICU
 endif # ENABLE_INTL_API
 
 include $(topsrcdir)/config/rules.mk
 
-.PHONY: buildffi buildicu
-buildffi buildicu:
-$(if $(MOZ_PSEUDO_DERECURSE),compile,export):: buildffi buildicu
-
-ifdef JS_HAS_CTYPES
-ifndef MOZ_NATIVE_FFI
-buildffi:
-		$(call SUBMAKE,,ctypes/libffi)
-
-distclean clean::
-		$(call SUBMAKE,$@,ctypes/libffi)
-endif
-endif
-
+.PHONY: buildicu
+buildicu:
+$(if $(MOZ_PSEUDO_DERECURSE),compile,export):: buildicu
 
 #############################################
 # BEGIN ECMAScript Internationalization API
 #
 
 # ICU headers need to be available whether we build with the complete
 # Internationalization API or not - ICU stubs rely on them.
 
--- a/moz.build
+++ b/moz.build
@@ -7,16 +7,18 @@
 CONFIGURE_SUBST_FILES += [
     'config/autoconf.mk',
     'config/emptyvars.mk',
 ]
 
 if CONFIG['BUILDING_JS']:
     if CONFIG['JS_STANDALONE']:
         add_tier_dir('base', ['config', 'mfbt'])
+    if CONFIG['JS_HAS_CTYPES'] and not CONFIG['MOZ_NATIVE_FFI']:
+        add_tier_dir('js', ['js/src/ctypes/libffi'], static=True)
     add_tier_dir('js', ['js/src'])
 else:
     CONFIGURE_SUBST_FILES += [
         'mozilla-config.h',
         'tools/update-packaging/Makefile',
     ]
 
     if CONFIG['ENABLE_CLANG_PLUGIN']: