X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=Makefile;h=b68d6f1baaeafeaf2f0dd8d851bad06e2785c1f9;hb=4de1bc1164ef40655caa148eeb50365112210561;hp=a451a841373a06e9d72a1a1d8385e012b109768f;hpb=0f814a4e57e80d2512934820b878211e9d71c93e;p=musl diff --git a/Makefile b/Makefile index a451a841..b68d6f1b 100644 --- a/Makefile +++ b/Makefile @@ -82,13 +82,7 @@ $(OBJ_DIRS): install: install-libs install-headers install-tools clean: - rm -f obj/crt/*.o obj/crt/$(ARCH)/*.o - rm -f $(OBJS) - rm -f $(LOBJS) - rm -f $(ALL_LIBS) lib/*.[ao] lib/*.so - rm -f $(ALL_TOOLS) - rm -f $(GENH) $(GENH_INT) - rm -f obj/include/bits/alltypes.h + rm -rf obj lib distclean: clean rm -f config.mak @@ -130,31 +124,32 @@ $(CRT_LIBS:lib/%=obj/crt/%): CFLAGS_ALL += -DCRT $(LOBJS): CFLAGS_ALL += -fPIC -DSHARED +CC_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $< + # Choose invocation of assembler to be used -# $(1) is input file, $(2) is output file, $(3) is assembler flags 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 $@ - else - AS_CMD = $(CC) $(CFLAGS_ALL) -c -o $@ $< + AS_CMD = $(CC_CMD) endif obj/%.o: $(srcdir)/%.s - $(AS_CMD) $(CFLAGS_ALL) + $(AS_CMD) obj/%.o: $(srcdir)/%.S - $(CC) $(CFLAGS_ALL) -c -o $@ $< + $(CC_CMD) obj/%.o: $(srcdir)/%.c $(GENH) $(IMPH) - $(CC) $(CFLAGS_ALL) -c -o $@ $< + $(CC_CMD) obj/%.lo: $(srcdir)/%.s - $(AS_CMD) $(CFLAGS_ALL) + $(AS_CMD) obj/%.lo: $(srcdir)/%.S - $(CC) $(CFLAGS_ALL) -c -o $@ $< + $(CC_CMD) obj/%.lo: $(srcdir)/%.c $(GENH) $(IMPH) - $(CC) $(CFLAGS_ALL) -c -o $@ $< + $(CC_CMD) lib/libc.so: $(LOBJS) $(CC) $(CFLAGS_ALL) $(LDFLAGS_ALL) -nostdlib -shared \