projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use soname in ld-musl.so to prevent filename appearing in DT_NEEDEDs
[musl]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
d0f16df
..
7185b83
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,39
+21,41
@@
LOBJS = $(OBJS:.o=.lo)
GENH = include/bits/alltypes.h
CFLAGS = -Os -nostdinc -ffreestanding -std=c99 -D_XOPEN_SOURCE=700 -pipe
GENH = include/bits/alltypes.h
CFLAGS = -Os -nostdinc -ffreestanding -std=c99 -D_XOPEN_SOURCE=700 -pipe
-LDFLAGS = -nostdlib -shared -
Wl,-Bsymbolic
-INC = -I./include -I./src/internal
-PIC = -fPIC
+LDFLAGS = -nostdlib -shared -
fPIC -Wl,-e,_start -Wl,-Bsymbolic-functions
+INC = -I./include -I./src/internal
-I./arch/$(ARCH)
+PIC = -fPIC
-O3
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
OBJCOPY = $(CROSS_COMPILE)objcopy
ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH))
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
OBJCOPY = $(CROSS_COMPILE)objcopy
ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH))
-EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv
+EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv
dl
EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
CRT_LIBS = lib/crt1.o lib/crti.o lib/crtn.o
LIBC_LIBS = lib/libc.a
ALL_LIBS = $(LIBC_LIBS) $(CRT_LIBS) $(EMPTY_LIBS)
EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a)
CRT_LIBS = lib/crt1.o lib/crti.o lib/crtn.o
LIBC_LIBS = lib/libc.a
ALL_LIBS = $(LIBC_LIBS) $(CRT_LIBS) $(EMPTY_LIBS)
+ALL_LDSO = lib/ld-musl-$(ARCH).so.1
ALL_TOOLS = tools/musl-gcc
-include config.mak
ALL_TOOLS = tools/musl-gcc
-include config.mak
-all: $(ALL_LIBS) $(ALL_TOOLS)
+all: $(ALL_LIBS) $(ALL_TOOLS)
$(ALL_LDSO)
-install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%)
+install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%)
$(ALL_LDSO:%=$(DESTDIR)/%) $(ALL_LDSO:%/ld-musl-$(ARCH).so.1=$(DESTDIR)$(libdir)/libc.so)
clean:
rm -f crt/*.o
rm -f $(OBJS)
rm -f $(LOBJS)
clean:
rm -f crt/*.o
rm -f $(OBJS)
rm -f $(LOBJS)
- rm -f $(ALL_LIBS) lib/*
+ rm -f $(ALL_LIBS) lib/*
.[ao] lib/*.so
rm -f $(ALL_TOOLS)
rm -f $(GENH)
rm -f include/bits
include/bits:
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
ln -sf ../arch/$(ARCH)/bits $@
include/bits/alltypes.h.sh: include/bits
@@
-73,8
+75,8
@@
include/bits/alltypes.h: include/bits/alltypes.h.sh
%.lo: %.c $(GENH)
$(CC) $(CFLAGS) $(INC) $(PIC) -c -o $@ $<
%.lo: %.c $(GENH)
$(CC) $(CFLAGS) $(INC) $(PIC) -c -o $@ $<
-lib/l
ibc.so
: $(LOBJS)
- $(CC) $(LDFLAGS) -o $@ $(LOBJS) -lgcc
+lib/l
d-musl-$(ARCH).so.1
: $(LOBJS)
+ $(CC) $(LDFLAGS) -
Wl,-soname=libc.so.1 -
o $@ $(LOBJS) -lgcc
$(OBJCOPY) --weaken $@
lib/libc.a: $(OBJS)
$(OBJCOPY) --weaken $@
lib/libc.a: $(OBJS)
@@
-83,21
+85,31
@@
lib/libc.a: $(OBJS)
$(RANLIB) $@
$(EMPTY_LIBS):
$(RANLIB) $@
$(EMPTY_LIBS):
+ rm -f $@
$(AR) rc $@
lib/%.o: crt/%.o
cp $< $@
tools/musl-gcc: tools/gen-musl-gcc.sh config.mak
$(AR) rc $@
lib/%.o: crt/%.o
cp $< $@
tools/musl-gcc: tools/gen-musl-gcc.sh config.mak
- sh $< "$(prefix)" > $@ || { rm -f $@ ; exit 1 ; }
+ sh $< "$(prefix)"
"$(ARCH)"
> $@ || { rm -f $@ ; exit 1 ; }
chmod +x $@
$(DESTDIR)$(bindir)/%: tools/%
install -D $< $@
chmod +x $@
$(DESTDIR)$(bindir)/%: tools/%
install -D $< $@
-$(DESTDIR)$(prefix)/%: %
+$(DESTDIR)$(libdir)/%: lib/%
+ install -D -m 644 $< $@
+
+$(DESTDIR)$(includedir)/%: include/%
install -D -m 644 $< $@
install -D -m 644 $< $@
+$(DESTDIR)/lib/ld-musl-$(ARCH).so.1: lib/ld-musl-$(ARCH).so.1
+ install -D -m 755 $< $@
+
+$(DESTDIR)$(libdir)/libc.so: lib/ld-musl-$(ARCH).so.1
+ ln -sf /lib/ld-musl-$(ARCH).so.1 $@
+
.PRECIOUS: $(CRT_LIBS:lib/%=crt/%)
.PHONY: all clean install
.PRECIOUS: $(CRT_LIBS:lib/%=crt/%)
.PHONY: all clean install