20814N/Adiff --git a/js/src/Makefile.in b/js/src/Makefile.in
20814N/Aindex b719c30..410ec63 100644
20814N/A--- a/js/src/Makefile.in
20814N/A+++ b/js/src/Makefile.in
20814N/A@@ -463,7 +463,7 @@
20814N/A $(NULL)
20814N/A
20814N/A LOCAL_INCLUDES = \
20814N/A- -Ictypes/libffi/include \
20814N/A+ `pkg-config --cflags libffi` \
20814N/A -I. \
20814N/A $(NULL)
20814N/A
20814N/A@@ -472,9 +472,7 @@
20814N/A ctypes/libffi/.libs/ffi.a \
20814N/A $(NULL)
20814N/A else
20814N/A-SHARED_LIBRARY_LIBS += \
20814N/A- ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \
20814N/A- $(NULL)
20814N/A+OS_LIBS += `pkg-config --libs libffi`
20814N/A endif
20814N/A
20814N/A endif # JS_HAS_CTYPES
20814N/A@@ -557,11 +555,11 @@
20814N/A ifdef JS_HAS_CTYPES
20814N/A # Build libffi proper as part of the 'exports' target, so things get built
20814N/A # in the right order.
20814N/A-export::
20814N/A- $(call SUBMAKE,,ctypes/libffi)
20814N/A+# export::
20814N/A+# $(call SUBMAKE,,ctypes/libffi)
20814N/A
20814N/A-distclean clean::
20814N/A- $(call SUBMAKE,$@,ctypes/libffi)
20814N/A+# distclean clean::
20814N/A+# $(call SUBMAKE,$@,ctypes/libffi)
20814N/A endif
20814N/A
20814N/A # Because the SpiderMonkey can be distributed and built independently
20814N/Adiff --git a/js/src/configure b/js/src/configure
20814N/Aindex 03fe471..0e98daf 100755
20814N/A--- a/js/src/configure
20814N/A+++ b/js/src/configure
20814N/A@@ -16243,6 +16243,8 @@ fi
20814N/A echo "$ac_t""invoking make to create js-config script" 1>&6
20814N/A $GMAKE js-config
20814N/A
20814N/A+# Build against system libffi
20814N/A+if test false = true ; then
20814N/A # Build jsctypes if it's enabled.
20814N/A if test "$JS_HAS_CTYPES"; then
20814N/A # Run the libffi 'configure' script.
20814N/A@@ -16423,4 +16425,4 @@ fi
20814N/A ac_configure_args="$_SUBDIR_CONFIG_ARGS"
20814N/A CONFIG_FILES=$old_config_files
20814N/A fi
20814N/A-
20814N/A+fi
20814N/Adiff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
20814N/Aindex 420cb20..afdcb02 100644
20814N/A--- a/toolkit/library/Makefile.in
20814N/A+++ b/toolkit/library/Makefile.in
20814N/A@@ -221,6 +221,10 @@
20814N/A endif
20814N/A endif
20814N/A
20814N/A+ifeq ($(OS_ARCH),SunOS)
20814N/A+EXTRA_DSO_LDOPTS += `pkg-config --libs libffi`
20814N/A+endif
20814N/A+
20814N/A ifeq ($(OS_ARCH),WINNT)
20814N/A OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32 msimg32 shlwapi psapi ws2_32 dbghelp)
20814N/A ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
20814N/Adiff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
20814N/Aindex 058b3b2..d06e809 100644
20814N/A--- a/js/src/shell/Makefile.in
20814N/A+++ b/js/src/shell/Makefile.in
20814N/A@@ -52,7 +52,7 @@ CPPSRCS = \
20814N/A
20814N/A DEFINES += -DEXPORT_JS_API
20814N/A
20814N/A-LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
20814N/A+LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) `pkg-config --libs libffi`
20814N/A
20814N/A LOCAL_INCLUDES += -I$(topsrcdir) -I..
20814N/A