diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 22:49:47 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2004-05-17 22:49:47 +0000 |
| commit | 62217bbd5d9a3f247fa57fc7b5d233289251bcad (patch) | |
| tree | b1fd893e422c8c7d47e86c3adda59436613ab5d2 | |
| parent | 5f36e09c9e96679a2e49f7b757fa8a934058977c (diff) | |
Work arounda behaviour change in binutils-2.14, now -m<...> -nostdlib
removes /usr/libdata from the script search path. add it back with a -L
| -rw-r--r-- | sys/arch/amd64/stand/biosboot/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/boot/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/mbr/Makefile | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/Makefile | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/biosboot/Makefile b/sys/arch/amd64/stand/biosboot/Makefile index 37f201d9f77..fd482baa9e2 100644 --- a/sys/arch/amd64/stand/biosboot/Makefile +++ b/sys/arch/amd64/stand/biosboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2004/02/03 12:09:47 mickey Exp $ +# $OpenBSD: Makefile,v 1.2 2004/05/17 22:49:46 drahn Exp $ MAN= biosboot.8 @@ -7,6 +7,7 @@ PROG= biosboot SRCS= biosboot.S LD=ld LDFLAGS=-melf_i386 -nostdlib -Ttext 0 -N -x -Bstatic +LDFLAGS+=-L/usr/libdata INSTALL_STRIP= SADIR= ${.CURDIR}/.. diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile index 82eb17fdc51..cebb1bbc5b2 100644 --- a/sys/arch/amd64/stand/boot/Makefile +++ b/sys/arch/amd64/stand/boot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2004/02/03 12:09:47 mickey Exp $ +# $OpenBSD: Makefile,v 1.2 2004/05/17 22:49:46 drahn Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -14,6 +14,7 @@ SRCS= srt0.S conf.c LD?= ld SIZE?= size LDFLAGS+=-melf_i386 -nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec +LDFLAGS+=-L/usr/libdata .PATH: ${SADIR}/libsa # i386 stuff (so, it will possibly load in the same 64k) diff --git a/sys/arch/amd64/stand/mbr/Makefile b/sys/arch/amd64/stand/mbr/Makefile index 670c731871c..7d87a1ccbc9 100644 --- a/sys/arch/amd64/stand/mbr/Makefile +++ b/sys/arch/amd64/stand/mbr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2004/02/03 12:09:47 mickey Exp $ +# $OpenBSD: Makefile,v 1.2 2004/05/17 22:49:46 drahn Exp $ # PROG= mbr @@ -6,6 +6,7 @@ SRCS= mbr.S AFLAGS+=-m32 -I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a LD=ld LDFLAGS=-melf_i386 -nostdlib -Ttext 0 -x -N -s -Bstatic -e start +LDFLAGS+=-L/usr/libdata NOMAN= #MAN+= mbr.8 diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile index f41cb437009..bbc89667f80 100644 --- a/sys/arch/amd64/stand/pxeboot/Makefile +++ b/sys/arch/amd64/stand/pxeboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2004/03/21 21:37:41 tom Exp $ +# $OpenBSD: Makefile,v 1.2 2004/05/17 22:49:46 drahn Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -13,6 +13,7 @@ SRCS= srt0.S conf.c devopen.c net.c open.c LD?= ld SIZE?= size LDFLAGS+=-melf_i386 -nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec +LDFLAGS+=-L/usr/libdata INSTALL_STRIP= .PATH: ${SADIR}/libsa |