summaryrefslogtreecommitdiffstats
path: root/usr.bin/doscmd/Makefile
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1999-02-17 13:48:07 +0000
committerbde <bde@FreeBSD.org>1999-02-17 13:48:07 +0000
commitcc82d3efe034afc0ae54c36a0ce76cba6f4cd730 (patch)
treee5504a766fbc37c5bed8fe141bfac0c50dc1b748 /usr.bin/doscmd/Makefile
parente819b6214db411651f8862becf52d7480ba20bcd (diff)
downloadFreeBSD-src-cc82d3efe034afc0ae54c36a0ce76cba6f4cd730.zip
FreeBSD-src-cc82d3efe034afc0ae54c36a0ce76cba6f4cd730.tar.gz
Use `${CC} ${CFLAGS} ${LDFLAGS} -nostdlib -Wl...' instead of
`ld ... <fudged ${LDFLAGS}>' to invoke the linker. This gets the flags and standard library paths right without complications. Unfortunately, it doesn't help for the X11 library paths -- cc only appends /aout for standard library paths.
Diffstat (limited to 'usr.bin/doscmd/Makefile')
-rw-r--r--usr.bin/doscmd/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index 218d7d0..2f0a91c 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -1,6 +1,6 @@
# from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp
#
-# $Id: Makefile,v 1.15 1999/02/15 12:36:21 bde Exp $
+# $Id: Makefile,v 1.16 1999/02/16 14:57:58 luoqi Exp $
PROG= doscmd
SRCS= AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
@@ -48,8 +48,8 @@ beforeinstall:
.if ${OBJFORMAT} == "aout"
doscmd: ${LIBCRT0} doscmd_loader.o ${LIBGCC} ${LIBC}
- ld -e start -dc -dp ${LDFLAGS:M-static:S/-static/-Bstatic/} \
- -o doscmd ${LIBCRT0} doscmd_loader.o -L${DESTDIR}${LIBDIR} -lgcc -lc
+ ${CC} ${CFLAGS} ${LDFLAGS} -nostdlib -Wl,-e,start,-dc,-dp \
+ -o doscmd ${LIBCRT0} doscmd_loader.o -lgcc -lc
# Bogusly generated dependency to get doscmd_loader.c looked at by mkdep.
.depend: doscmd_loader.c
@@ -77,6 +77,6 @@ NEED_LIBNAMES= yes
# This must be after bsd.prog.mk is included so that ${OBJS} in the
# dependency gets expanded.
doscmd.kernel: crt0.o ${OBJS} ${DPADD}
- ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS:N-static} \
- crt0.o ${OBJS} ${LDADD}
+ ${CC} ${CFLAGS} ${LDFLAGS} -static -nostdlib -Wl,-N,-T,110000 \
+ -o doscmd.kernel crt0.o ${OBJS} ${LDADD}
.endif
OpenPOWER on IntegriCloud