diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index ae7b695be85..9123a6eefe6 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -454,10 +454,15 @@ ifdef ENABLE_TESTS
 tier_99_dirs	+= tools/test-harness
 endif
 
+# Don't build the Java interfaces when cross compiling since that depends on the
+# program GenerateJavaInterfaces (which doesn't work when cross compiling).
+# This ifndef can be removed when bug 333618 is checked in.
+ifndef CROSS_COMPILE
 # This should be built last, after all IDL files in the tree have been processed
 ifdef MOZ_JAVAXPCOM
 tier_99_dirs += extensions/java/xpcom/interfaces
 endif
+endif
 
 default alldep all:: $(SUBMAKEFILES)
 	$(RM) -rf $(DIST)/sdk
diff --git a/mozilla/extensions/java/xpcom/Makefile.in b/mozilla/extensions/java/xpcom/Makefile.in
index 9757e1bc55a..e0d5a660291 100644
--- a/mozilla/extensions/java/xpcom/Makefile.in
+++ b/mozilla/extensions/java/xpcom/Makefile.in
@@ -44,10 +44,11 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = src
 
-TOOL_DIRS = \
-	tools/genifaces \
-	glue \
-	$(NULL)
+TOOL_DIRS = glue
+
+ifndef CROSS_COMPILE
+TOOL_DIRS += tools/genifaces
+endif
 
 include $(topsrcdir)/config/rules.mk