Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 348884 - Don't generate Java interfaces when cross compiling. Fix for Mac/Universal builds. r=bsmedberg.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@207763 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com 2006-08-17 19:42:39 +00:00
parent f1ced83b02
commit 9917c08815
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/Makefile.in
View File

@ -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

9
mozilla/extensions/java/xpcom/Makefile.in
View File

@ -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