1993-12-04 00:53:02 +00:00
|
|
|
# $Id: Makefile,v 1.12 1993/12/02 09:56:30 ache Exp $
|
1993-11-03 23:41:59 +00:00
|
|
|
#
|
1993-06-29 09:58:20 +00:00
|
|
|
|
|
|
|
|
PROG= ld
|
1993-11-03 23:41:59 +00:00
|
|
|
SRCS= ld.c symbol.c lib.c shlib.c warnings.c etc.c rrs.c xbits.c md.c
|
1993-12-04 00:53:02 +00:00
|
|
|
CFLAGS += -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE)
|
1993-11-03 23:41:59 +00:00
|
|
|
|
|
|
|
|
LDADD+= -lgnumalloc
|
|
|
|
|
DPADD+= /usr/lib/libgnumalloc.a
|
Sorry, Jordan, but I restore previous version again.
You write that
LDFLAGS+= -Xlinker -Bstatic
no more needed, but you have
CFLAGS += -static -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE)
This -static doesn't make any sense in your version,
because it not passed to linker's state (LDFLAGS),
so we have SHARED /usr/bin/ld in this case.
(Older Makefile produce non-shared ld).
I suppose, that -static in CFLAGS was introduced to
make non-shared ld, so I restore previous LDFLAGS
to have non-shared ld. If we want to have shared ld
we need to remove -static from CFLAGS too, not only LDFLAGS,
but this need special issue and corresponding
commit log. Your current version hang into intermediate
state (beetween two sides), so I move it to one side.
Second, I restore NOPIC dependance again from older Makefile:
.if !defined(NOPIC)
SUBDIR+= rtld
.endif
We don't need ld.so, if NOPIC
P.S. I don't see any purpose to commit new makefile, old version
is better.
1993-12-02 09:56:30 +00:00
|
|
|
LDFLAGS+= -Xlinker -Bstatic
|
1993-11-03 23:41:59 +00:00
|
|
|
|
Sorry, Jordan, but I restore previous version again.
You write that
LDFLAGS+= -Xlinker -Bstatic
no more needed, but you have
CFLAGS += -static -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE)
This -static doesn't make any sense in your version,
because it not passed to linker's state (LDFLAGS),
so we have SHARED /usr/bin/ld in this case.
(Older Makefile produce non-shared ld).
I suppose, that -static in CFLAGS was introduced to
make non-shared ld, so I restore previous LDFLAGS
to have non-shared ld. If we want to have shared ld
we need to remove -static from CFLAGS too, not only LDFLAGS,
but this need special issue and corresponding
commit log. Your current version hang into intermediate
state (beetween two sides), so I move it to one side.
Second, I restore NOPIC dependance again from older Makefile:
.if !defined(NOPIC)
SUBDIR+= rtld
.endif
We don't need ld.so, if NOPIC
P.S. I don't see any purpose to commit new makefile, old version
is better.
1993-12-02 09:56:30 +00:00
|
|
|
SUBDIR= ldconfig ldd
|
|
|
|
|
.if !defined(NOPIC)
|
|
|
|
|
SUBDIR+= rtld
|
|
|
|
|
.endif
|
1993-12-02 00:56:40 +00:00
|
|
|
|
1993-11-03 23:41:59 +00:00
|
|
|
.PATH: $(.CURDIR)/$(MACHINE)
|
1993-06-29 09:58:20 +00:00
|
|
|
|
|
|
|
|
.include <bsd.prog.mk>
|
