improve Makefile handling of git checkouts with missing lib/ and config.mak

[musl] / Makefile

diff --git a/Makefile b/Makefile
index e4235cb..c3d29d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,9 @@ OBJS = $(SRCS:.c=.o)
 LOBJS = $(OBJS:.o=.lo)
 GENH = include/bits/alltypes.h
 
-CFLAGS  = -Os -nostdinc -ffreestanding -pipe
+CFLAGS  = -Os -nostdinc -ffreestanding -std=c99 -D_XOPEN_SOURCE=700 -pipe
 LDFLAGS = -nostdlib -shared -Wl,-Bsymbolic
-INC     = -I./include -I./src/internal
+INC     = -I./include -I./src/internal -I./arch/$(ARCH)
 PIC     = -fPIC
 AR      = $(CROSS_COMPILE)ar
 RANLIB  = $(CROSS_COMPILE)ranlib
@@ -51,6 +51,13 @@ clean:
        rm -f $(ALL_LIBS) lib/*
        rm -f $(ALL_TOOLS)
        rm -f $(GENH) 
+       rm -f include/bits
+
+include/bits:
+       @test "$(ARCH)" || { echo "Please set ARCH in config.mak before running make." ; exit 1 ; }
+       ln -sf ../arch/$(ARCH)/bits $@
+
+include/bits/alltypes.h.sh: include/bits
 
 include/bits/alltypes.h: include/bits/alltypes.h.sh
        sh $< > $@
@@ -67,19 +74,22 @@ include/bits/alltypes.h: include/bits/alltypes.h.sh
 %.lo: %.c $(GENH)
        $(CC) $(CFLAGS) $(INC) $(PIC) -c -o $@ $<
 
-lib/libc.so: $(LOBJS)
+lib:
+       mkdir -p lib
+
+lib/libc.so: $(LOBJS) lib
        $(CC) $(LDFLAGS) -o $@ $(LOBJS) -lgcc
        $(OBJCOPY) --weaken $@
 
-lib/libc.a: $(OBJS)
+lib/libc.a: $(OBJS) lib
        rm -f $@
        $(AR) rc $@ $(OBJS)
        $(RANLIB) $@
 
-$(EMPTY_LIBS):
+$(EMPTY_LIBS): lib
        $(AR) rc $@
 
-lib/%.o: crt/%.o
+lib/%.o: crt/%.o lib
        cp $< $@
 
 tools/musl-gcc: tools/gen-musl-gcc.sh config.mak