From d416609b0724ddd2d83c4bcae6ba40a2d92636ad Mon Sep 17 00:00:00 2001 From: "pedemont%us.ibm.com" Date: Wed, 23 Aug 2006 19:32:53 +0000 Subject: [PATCH] Bug 348884 - XULRunner Mac/Universal build fails trying to build JavaXPCOM. r=bsmedberg, a=beltzner. XULRunner only git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@208213 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/Makefile.in | 5 +++++ mozilla/extensions/java/xpcom/Makefile.in | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in index 157ed1e1849..2a579c48882 100644 --- a/mozilla/Makefile.in +++ b/mozilla/Makefile.in @@ -417,10 +417,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 else 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