picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2002-12-31 Roland McGrath <roland@redhat.com>

Browse source 
* Makerules (compile.S, COMPILE.S): Remove -DASSEMBLER here.
	Use $(S-CPPFLAGS) in place of $(asm-CPPFLAGS).
	(S-CPPFLAGS): Add -DASSEMBLER here instead.
	(generate-md5, +make-deps): Fix magic to get $(S-CPPFLAGS).
This commit is contained in:
Roland McGrath 2002-12-31 21:14:21 +00:00
parent 6d6ee629af
commit f4281cc49b
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makerules
View file

@ -370,16 +370,14 @@ endif
# GCC can grok options after the file name, and it looks nicer that way. # GCC can grok options after the file name, and it looks nicer that way.
compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS) compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS)
compile.S = \ compile.S = $(CC) $< -c $(CPPFLAGS) $(S-CPPFLAGS) $(ASFLAGS-$(suffix $@))
$(CC) $< -c $(CPPFLAGS) -DASSEMBLER $(asm-CPPFLAGS) $(ASFLAGS-$(suffix $@)) COMPILE.S = $(CC) -c $(CPPFLAGS) $(S-CPPFLAGS) $(ASFLAGS-$(suffix $@))
COMPILE.S = \
$(CC) -c $(CPPFLAGS) -DASSEMBLER $(asm-CPPFLAGS) $(ASFLAGS-$(suffix $@))
COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS) COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS)
# If we want to generate MD5 checksums for the sources do this now. # If we want to generate MD5 checksums for the sources do this now.
ifeq ($(md5),yes) ifeq ($(md5),yes)
generate-md5 = ; rm -f $(@:.d=.md5); \ generate-md5 = ; rm -f $(@:.d=.md5); \
$(CC) -E $< $(CFLAGS) $(CPPFLAGS) $($(<:$*.%=%)-CPPFLAGS) | \ $(CC) -E $< $(CFLAGS) $(CPPFLAGS) $($(patsubst .%,%,$(suffix $(<F)))-CPPFLAGS) | \
sed '/^\#/d;/^[[:space:]]*$$/d' | md5sum > $(@:.d=.md5) sed '/^\#/d;/^[[:space:]]*$$/d' | md5sum > $(@:.d=.md5)
else else
generate-md5 = generate-md5 =
@ -393,11 +391,11 @@ OUTPUT_OPTION = -o $@
# We need the $(CFLAGS) to be in there to have the right predefines during # We need the $(CFLAGS) to be in there to have the right predefines during
# the dependency run for C sources. But having it for assembly sources can # the dependency run for C sources. But having it for assembly sources can
# get the wrong predefines. # get the wrong predefines.
S-CPPFLAGS = $(asm-CPPFLAGS) S-CPPFLAGS = -DASSEMBLER $(asm-CPPFLAGS)
define +make-deps define +make-deps
$(make-target-directory) $(make-target-directory)
$(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \ $(+mkdep) $< $(if $(filter %.c,$<),$(CFLAGS)) \
$(CPPFLAGS) $($(<:$*.%=%)-CPPFLAGS) | sed \ $(CPPFLAGS) $($(patsubst .%,%,$(suffix $(<F)))-CPPFLAGS) | sed \
-e 's,$(subst .,\.,$*)\.o,$(foreach o,$(all-object-suffixes),$(@:.d=$o)) $@,' \ -e 's,$(subst .,\.,$*)\.o,$(foreach o,$(all-object-suffixes),$(@:.d=$o)) $@,' \
$(sed-remove-objpfx) > $(@:.d=.T) $(sed-remove-objpfx) > $(@:.d=.T)
mv -f $(@:.d=.T) $@ $(generate-md5) mv -f $(@:.d=.T) $@ $(generate-md5)