Remove /usr/X386/lib and /usr/local/lib from the default locations,

[unix-history] / gnu / usr.bin / ld / rtld / Makefile

diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index 7fb70ea..1a76c51 100644 (file)
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,15 +1,16 @@
-#      $Id: Makefile,v 1.5 1993/11/22 19:05:26 jkh Exp $
+#      $Id: Makefile,v 1.7 1993/12/11 21:05:59 jkh Exp $

 
 PROG=  ld.so
 
 PROG=  ld.so

-SRCS=  mdprologue.S rtld.c shlib.c etc.c md.c
+SRCS=  mdprologue.S sbrk.c rtld.c shlib.c etc.c md.c

 NOMAN= noman
 LDDIR?= $(.CURDIR)/..
 #PICFLAG=-pic
 PICFLAG=-fpic
 CFLAGS += -I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) -O $(PICFLAG) -DRTLD
 NOMAN= noman
 LDDIR?= $(.CURDIR)/..
 #PICFLAG=-pic
 PICFLAG=-fpic
 CFLAGS += -I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) -O $(PICFLAG) -DRTLD

-LDFLAGS = -Bshareable -Bsymbolic -assert nosymbolic
+LDFLAGS = -Bshareable -Bsymbolic -assert nosymbolic -Z

 LIBS =  -lc_pic -lgcc_pic
 BINDIR= /usr/libexec
 LIBS =  -lc_pic -lgcc_pic
 BINDIR= /usr/libexec

+ASFLAGS = -k

 
 .PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
 
 
 .PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
 


@@ -19,6 +20,6 @@ $(PROG):
        $(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIBS) $(LDADD)
 
 .S.o:
        $(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIBS) $(LDADD)
 
 .S.o:

-       $(CPP) $(.IMPSRC) | $(AS) -k -o $(.TARGET) -
+       $(CPP) $(.IMPSRC) | $(AS) $(ASFLAGS) -o $(.TARGET) -

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>