projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make regoff_t and regex_t match C++ ABI
[musl]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
683850d
..
b9b7807
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-16,7
+16,7
@@
includedir = $(prefix)/include
libdir = $(prefix)/lib
syslibdir = /lib
libdir = $(prefix)/lib
syslibdir = /lib
-SRCS = $(sort $(wildcard src/*/*.c))
+SRCS = $(sort $(wildcard src/*/*.c
arch/$(ARCH)/src/*.c
))
OBJS = $(SRCS:.c=.o)
LOBJS = $(OBJS:.o=.lo)
GENH = include/bits/alltypes.h
OBJS = $(SRCS:.c=.o)
LOBJS = $(OBJS:.o=.lo)
GENH = include/bits/alltypes.h
@@
-32,12
+32,13
@@
CFLAGS_ALL = $(CFLAGS_C99FSE)
CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I./arch/$(ARCH) -I./src/internal -I./include
CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS)
CFLAGS_ALL_STATIC = $(CFLAGS_ALL)
CFLAGS_ALL += -D_XOPEN_SOURCE=700 -I./arch/$(ARCH) -I./src/internal -I./include
CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS)
CFLAGS_ALL_STATIC = $(CFLAGS_ALL)
-CFLAGS_ALL_SHARED = $(CFLAGS_ALL) -fPIC -DSHARED
-O3
+CFLAGS_ALL_SHARED = $(CFLAGS_ALL) -fPIC -DSHARED
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
-ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH))
+ARCH_INCLUDES = $(wildcard arch/$(ARCH)/bits/*.h)
+ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH) $(ARCH_INCLUDES:arch/$(ARCH)/%=include/%))
EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl
EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl
EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
@@
-48,13
+49,13
@@
TOOL_LIBS = lib/musl-gcc.specs
ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS)
ALL_TOOLS = tools/musl-gcc
ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS)
ALL_TOOLS = tools/musl-gcc
-LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH).so.1
+LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)
$(SUBARCH)
.so.1
-include config.mak
all: $(ALL_LIBS) $(ALL_TOOLS)
-include config.mak
all: $(ALL_LIBS) $(ALL_TOOLS)
-install:
$(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
+install:
install-libs install-headers install-tools
clean:
rm -f crt/*.o
clean:
rm -f crt/*.o
@@
-72,10
+73,10
@@
include/bits:
@test "$(ARCH)" || { echo "Please set ARCH in config.mak before running make." ; exit 1 ; }
ln -sf ../arch/$(ARCH)/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.
in
: include/bits
-include/bits/alltypes.h: include/bits/alltypes.h.
sh
- s
h $<
> $@
+include/bits/alltypes.h: include/bits/alltypes.h.
in include/alltypes.h.in tools/mkalltypes.sed
+ s
ed -f tools/mkalltypes.sed include/bits/alltypes.h.in include/alltypes.h.in
> $@
src/ldso/dynlink.lo: arch/$(ARCH)/reloc.h
src/ldso/dynlink.lo: arch/$(ARCH)/reloc.h
@@
-94,7
+95,7
@@
src/ldso/dynlink.lo: arch/$(ARCH)/reloc.h
lib/libc.so: $(LOBJS)
$(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -nostdlib -shared \
-Wl,-e,_start -Wl,-Bsymbolic-functions \
lib/libc.so: $(LOBJS)
$(CC) $(CFLAGS_ALL_SHARED) $(LDFLAGS) -nostdlib -shared \
-Wl,-e,_start -Wl,-Bsymbolic-functions \
- -
Wl,-soname=libc.so -
o $@ $(LOBJS) $(LIBCC)
+ -o $@ $(LOBJS) $(LIBCC)
lib/libc.a: $(OBJS)
rm -f $@
lib/libc.a: $(OBJS)
rm -f $@
@@
-112,7
+113,7
@@
lib/musl-gcc.specs: tools/musl-gcc.specs.sh config.mak
sh $< "$(includedir)" "$(libdir)" "$(LDSO_PATHNAME)" > $@
tools/musl-gcc: config.mak
sh $< "$(includedir)" "$(libdir)" "$(LDSO_PATHNAME)" > $@
tools/musl-gcc: config.mak
- printf '#!/bin/sh\nexec
gcc
"$$@" -specs "%s/musl-gcc.specs"\n' "$(libdir)" > $@
+ printf '#!/bin/sh\nexec
"$${REALGCC:-gcc}"
"$$@" -specs "%s/musl-gcc.specs"\n' "$(libdir)" > $@
chmod +x $@
$(DESTDIR)$(bindir)/%: tools/%
chmod +x $@
$(DESTDIR)$(bindir)/%: tools/%
@@
-124,6
+125,9
@@
$(DESTDIR)$(libdir)/%.so: lib/%.so
$(DESTDIR)$(libdir)/%: lib/%
install -D -m 644 $< $@
$(DESTDIR)$(libdir)/%: lib/%
install -D -m 644 $< $@
+$(DESTDIR)$(includedir)/bits/%: arch/$(ARCH)/bits/%
+ install -D -m 644 $< $@
+
$(DESTDIR)$(includedir)/%: include/%
install -D -m 644 $< $@
$(DESTDIR)$(includedir)/%: include/%
install -D -m 644 $< $@
@@
-133,6
+137,14
@@
$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(syslibdir)
$(DESTDIR)$(syslibdir):
install -d -m 755 $(DESTDIR)$(syslibdir)
$(DESTDIR)$(syslibdir):
install -d -m 755 $(DESTDIR)$(syslibdir)
+install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
+
+install-headers: $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%)
+
+install-tools: $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%)
+
+
+
.PRECIOUS: $(CRT_LIBS:lib/%=crt/%)
.PRECIOUS: $(CRT_LIBS:lib/%=crt/%)
-.PHONY: all clean install
+.PHONY: all clean install
install-libs install-headers install-tools