deduplicate compiler invocation command line in makefile

also clean up duplication of CFLAGS passing to assembler.
This commit is contained in:
Rich Felker 2016-01-20 02:58:29 +00:00
parent 80de11bc6b
commit ada4798df0

View File

@ -130,30 +130,32 @@ $(CRT_LIBS:lib/%=obj/crt/%): CFLAGS_ALL += -DCRT
$(LOBJS): CFLAGS_ALL += -fPIC -DSHARED $(LOBJS): CFLAGS_ALL += -fPIC -DSHARED
CC_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $<
# Choose invocation of assembler to be used # Choose invocation of assembler to be used
ifeq ($(ADD_CFI),yes) ifeq ($(ADD_CFI),yes)
AS_CMD = LC_ALL=C awk -f $(srcdir)/tools/add-cfi.common.awk -f $(srcdir)/tools/add-cfi.$(ARCH).awk $< | $(CC) $(CFLAGS_ALL) -x assembler -c -o $@ - AS_CMD = LC_ALL=C awk -f $(srcdir)/tools/add-cfi.common.awk -f $(srcdir)/tools/add-cfi.$(ARCH).awk $< | $(CC) $(CFLAGS_ALL) -x assembler -c -o $@ -
else else
AS_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $< AS_CMD = $(CC_CMD)
endif endif
obj/%.o: $(srcdir)/%.s obj/%.o: $(srcdir)/%.s
$(AS_CMD) $(CFLAGS_ALL) $(AS_CMD)
obj/%.o: $(srcdir)/%.S obj/%.o: $(srcdir)/%.S
$(CC) $(CFLAGS_ALL) -c -o $@ $< $(CC_CMD)
obj/%.o: $(srcdir)/%.c $(GENH) $(IMPH) obj/%.o: $(srcdir)/%.c $(GENH) $(IMPH)
$(CC) $(CFLAGS_ALL) -c -o $@ $< $(CC_CMD)
obj/%.lo: $(srcdir)/%.s obj/%.lo: $(srcdir)/%.s
$(AS_CMD) $(CFLAGS_ALL) $(AS_CMD)
obj/%.lo: $(srcdir)/%.S obj/%.lo: $(srcdir)/%.S
$(CC) $(CFLAGS_ALL) -c -o $@ $< $(CC_CMD)
obj/%.lo: $(srcdir)/%.c $(GENH) $(IMPH) obj/%.lo: $(srcdir)/%.c $(GENH) $(IMPH)
$(CC) $(CFLAGS_ALL) -c -o $@ $< $(CC_CMD)
lib/libc.so: $(LOBJS) lib/libc.so: $(LOBJS)
$(CC) $(CFLAGS_ALL) $(LDFLAGS_ALL) -nostdlib -shared \ $(CC) $(CFLAGS_ALL) $(LDFLAGS_ALL) -nostdlib -shared \