Make sure libpwd.a is linked _last_ so it overrides the system pwd/grp
implementation. It wasn't doing that as expected...
This commit is contained in:
parent
47cdcdd359
commit
c27b9544b6
8
Makefile
8
Makefile
@ -289,7 +289,7 @@ docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
|
|||||||
|
|
||||||
|
|
||||||
busybox: $(PWD_LIB) $(OBJECTS)
|
busybox: $(PWD_LIB) $(OBJECTS)
|
||||||
$(CC) $(LDFLAGS) -o $@ $^ $(LIBRARIES)
|
$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBRARIES) $(PWD_LIB)
|
||||||
$(STRIP)
|
$(STRIP)
|
||||||
|
|
||||||
# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
|
# Without VPATH, rule expands to "/bin/sh busybox.mkll Config.h applets.h"
|
||||||
@ -306,8 +306,8 @@ $(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile
|
|||||||
- mkdir -p $(PWD_GRP)
|
- mkdir -p $(PWD_GRP)
|
||||||
$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
|
$(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o
|
||||||
|
|
||||||
$(PWD_LIB): $(PWD_OBJS)
|
libpwd.a: $(PWD_OBJS)
|
||||||
$(AR) $(ARFLAGS) $(PWD_LIB) $^
|
$(AR) $(ARFLAGS) $@ $^
|
||||||
|
|
||||||
usage.o: usage.h
|
usage.o: usage.h
|
||||||
|
|
||||||
@ -326,7 +326,7 @@ clean:
|
|||||||
- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
|
- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
|
||||||
docs/busybox.pdf docs/busybox.lineo.com/busybox.html
|
docs/busybox.pdf docs/busybox.lineo.com/busybox.html
|
||||||
- rm -f multibuild.log Config.h.orig
|
- rm -f multibuild.log Config.h.orig
|
||||||
- rm -rf docs/busybox _install $(PWD_LIB)
|
- rm -rf docs/busybox _install libpwd.a
|
||||||
- rm -f busybox.links loop.h *~ slist.mk core applet_source_list
|
- rm -f busybox.links loop.h *~ slist.mk core applet_source_list
|
||||||
- find -name \*.o -exec rm -f {} \;
|
- find -name \*.o -exec rm -f {} \;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user