Bug 538002 - Get libffi 3.0.9 working on OS/2. Part 3: Mozilla bits. r=dwitte

js/src/Makefile.in

@@ -291,14 +291,15 @@ LOCAL_INCLUDES = \
     $(NULL)
 
 ifeq ($(OS_ARCH),OS2)
-# libffi builds an aout lib on OS/2; convert it to an OMF lib.
-ctypes/libffi/.libs/libffi.$(LIB_SUFFIX): ctypes/libffi/.libs/libffi.a
-	emxomf $<
-endif
-
+SHARED_LIBRARY_LIBS += \
+    ctypes/libffi/.libs/ffi.a \
+    $(NULL)
+else
 SHARED_LIBRARY_LIBS += \
     ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \
     $(NULL)
+endif
+
 endif # JS_HAS_CTYPES
 
 ifdef HAVE_DTRACE

js/src/configure.in

@@ -5380,6 +5380,9 @@ if test "$JS_HAS_CTYPES"; then
     # Always use gcc for libffi on Solaris
     ac_configure_args="$ac_configure_args CC=gcc"
   fi
+  if test "$OS_ARCH" = "OS2"; then
+    ac_configure_args="$ac_configure_args CFLAGS=-Zomf AR=emxomfar"
+  fi
 
   # Use a separate cache file for libffi, since it does things differently
   # from our configure.