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

Forte doesn't allow suffixes other than .o so change the naming scheme of host-compiled object files from .ho to host_%.o . Adds the unenforced rule that source files should not start with host_.

Browse Source 
Bug #179895 Fixing tinderbox bustage


git-svn-id: svn://10.0.0.236/trunk@133891 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com 2002-11-15 07:24:44 +00:00
parent 05d28cad33
commit 4bb4a830f1
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/config/rules.mk
View File

@ -236,7 +236,7 @@ OBJS = $(strip $(_OBJS))
endif
ifndef HOST_OBJS
HOST_OBJS = $(HOST_CSRCS:.c=.ho)
HOST_OBJS = $(addprefix host_,$(HOST_CSRCS:.c=.o))
endif
ifeq ($(OS_ARCH),OS2)
@ -274,7 +274,7 @@ GARBAGE += $(SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
endif
ifdef HOST_SIMPLE_PROGRAMS
GARBAGE += $(HOST_SIMPLE_PROGRAMS:%=%.ho)
GARBAGE += $(addprefix host_,$(HOST_SIMPLE_PROGRAMS:%=%.o))
endif
#
@ -700,7 +700,7 @@ distclean:: $(SUBMAKEFILES)
-rm -rf $(ALL_TRASH_DIRS)
-rm -f $(ALL_TRASH) \
Makefile .HSancillary \
$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) \
$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o) \
$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX))
ifeq ($(MOZ_OS2_TOOLS),VACPP)
-rm -f $(PROGRAM:.exe=.map)
@ -782,7 +782,7 @@ ifdef MOZ_POST_PROGRAM_COMMAND
$(MOZ_POST_PROGRAM_COMMAND) $@
endif
$(HOST_SIMPLE_PROGRAMS): host_%$(BIN_SUFFIX): %.ho $(HOST_EXTRA_DEPS) Makefile Makefile.in
$(HOST_SIMPLE_PROGRAMS): host_%$(BIN_SUFFIX): host_%.o $(HOST_EXTRA_DEPS) Makefile Makefile.in
$(HOST_CC) $(OUTOPTION)$@ $(HOST_CFLAGS) $(INCLUDES) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
#
@ -974,6 +974,15 @@ endif # !COMPILER_DEPEND
endif # MOZ_AUTO_DEPS
# Rules for building native targets must come first because of the host_ prefix
host_%.o: %.c Makefile.in
$(REPORT_BUILD)
ifdef _NO_AUTO_VARS
$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(srcdir)/$*.c
else
$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $<
endif
%: %.c Makefile.in
$(REPORT_BUILD)
@$(MAKE_DEPS_AUTO)
@ -992,14 +1001,6 @@ else
$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $<
endif
%.ho: %.c Makefile.in
$(REPORT_BUILD)
ifdef _NO_AUTO_VARS
$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(srcdir)/$*.c
else
$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $<
endif
moc_%.cpp: %.h Makefile.in
$(MOC) $< $(OUTOPTION)$@
@ -1527,7 +1528,7 @@ endif
# hundreds of built-in suffix rules for stuff we don't need.
#
.SUFFIXES:
.SUFFIXES: .out .a .ln .o .ho .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .pp .mk .in .$(OBJ_SUFFIX) .mm .idl $(BIN_SUFFIX)
.SUFFIXES: .out .a .ln .o .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .pp .mk .in .$(OBJ_SUFFIX) .mm .idl $(BIN_SUFFIX)
#
# Fake targets. Always run these rules, even if a file/directory with that