forked from Imagelibrary/rtems
Added missing parts of patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>.
This commit is contained in:
@@ -203,8 +203,20 @@ ${ARCH}/%.o: %.s
|
|||||||
|
|
||||||
# Specify our own default rule for this to prevent having CFLAGS and
|
# Specify our own default rule for this to prevent having CFLAGS and
|
||||||
# CPPFLAGS being passed to linker
|
# CPPFLAGS being passed to linker
|
||||||
${ARCH}/%: ${ARCH}/%.o
|
#
|
||||||
${CC} ${LDFLAGS} -o $@ $@.o ${LD_LIBS}
|
#
|
||||||
|
# NOTE (Ralf): Having this rule is a bug, IMO.
|
||||||
|
# I have only kept it for the moment because some (broken) Makefiles
|
||||||
|
# might need it.
|
||||||
|
#
|
||||||
|
# ${ARCH}/%: ${ARCH}/%.o
|
||||||
|
# ${CC} ${LDFLAGS} -o $@ $@.o ${LD_LIBS}
|
||||||
|
#
|
||||||
|
# Anyway, the rule above is wrong. The one below should be correct
|
||||||
|
# (But this one should also not be necessary. If something breaks now,
|
||||||
|
# have a look at the Makefile or custom/*.cfg :-)
|
||||||
|
# $(ARCH)/%.exe: $(ARCH)/%.o
|
||||||
|
# $(make-exe)
|
||||||
|
|
||||||
# Make foo.rel from foo.o
|
# Make foo.rel from foo.o
|
||||||
${ARCH}/%.rel: ${ARCH}/%.o
|
${ARCH}/%.rel: ${ARCH}/%.o
|
||||||
@@ -271,11 +283,11 @@ endif
|
|||||||
# gcc27:
|
# gcc27:
|
||||||
# $(PGM): $(LINK_FILES)
|
# $(PGM): $(LINK_FILES)
|
||||||
# $(LD) $(LDFLAGS) -o $@ $(LINK_OBJS) \
|
# $(LD) $(LDFLAGS) -o $@ $(LINK_OBJS) \
|
||||||
# --start-group $(LIB_LIBS) --end-group
|
# --start-group $(LINK_LIBS) --end-group
|
||||||
#
|
#
|
||||||
# gcc28:
|
# gcc28:
|
||||||
# $(PGM): $(LINK_FILES)
|
# $(PGM): $(LINK_FILES)
|
||||||
# $(CC) $(CFLAGS) -o $@ $(LINK_OBJS) $(LIB_LIBS)
|
# $(CC) $(CFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
|
||||||
#
|
#
|
||||||
|
|
||||||
LINK_OBJS =\
|
LINK_OBJS =\
|
||||||
|
|||||||
@@ -203,8 +203,20 @@ ${ARCH}/%.o: %.s
|
|||||||
|
|
||||||
# Specify our own default rule for this to prevent having CFLAGS and
|
# Specify our own default rule for this to prevent having CFLAGS and
|
||||||
# CPPFLAGS being passed to linker
|
# CPPFLAGS being passed to linker
|
||||||
${ARCH}/%: ${ARCH}/%.o
|
#
|
||||||
${CC} ${LDFLAGS} -o $@ $@.o ${LD_LIBS}
|
#
|
||||||
|
# NOTE (Ralf): Having this rule is a bug, IMO.
|
||||||
|
# I have only kept it for the moment because some (broken) Makefiles
|
||||||
|
# might need it.
|
||||||
|
#
|
||||||
|
# ${ARCH}/%: ${ARCH}/%.o
|
||||||
|
# ${CC} ${LDFLAGS} -o $@ $@.o ${LD_LIBS}
|
||||||
|
#
|
||||||
|
# Anyway, the rule above is wrong. The one below should be correct
|
||||||
|
# (But this one should also not be necessary. If something breaks now,
|
||||||
|
# have a look at the Makefile or custom/*.cfg :-)
|
||||||
|
# $(ARCH)/%.exe: $(ARCH)/%.o
|
||||||
|
# $(make-exe)
|
||||||
|
|
||||||
# Make foo.rel from foo.o
|
# Make foo.rel from foo.o
|
||||||
${ARCH}/%.rel: ${ARCH}/%.o
|
${ARCH}/%.rel: ${ARCH}/%.o
|
||||||
@@ -271,11 +283,11 @@ endif
|
|||||||
# gcc27:
|
# gcc27:
|
||||||
# $(PGM): $(LINK_FILES)
|
# $(PGM): $(LINK_FILES)
|
||||||
# $(LD) $(LDFLAGS) -o $@ $(LINK_OBJS) \
|
# $(LD) $(LDFLAGS) -o $@ $(LINK_OBJS) \
|
||||||
# --start-group $(LIB_LIBS) --end-group
|
# --start-group $(LINK_LIBS) --end-group
|
||||||
#
|
#
|
||||||
# gcc28:
|
# gcc28:
|
||||||
# $(PGM): $(LINK_FILES)
|
# $(PGM): $(LINK_FILES)
|
||||||
# $(CC) $(CFLAGS) -o $@ $(LINK_OBJS) $(LIB_LIBS)
|
# $(CC) $(CFLAGS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
|
||||||
#
|
#
|
||||||
|
|
||||||
LINK_OBJS =\
|
LINK_OBJS =\
|
||||||
|
|||||||
Reference in New Issue
Block a user