cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert messy ld.bfd handling and replace with USE_LLD=No.

Browse Source
This commit is contained in:
sthen 2019-01-04 17:01:18 +00:00
parent 64ff8f9528
commit b3188a79dd
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sysutils/firmware/vmm/Makefile
View File

@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.16 2018/12/10 16:25:17 claudio Exp $
# $OpenBSD: Makefile,v 1.17 2019/01/04 17:01:18 sthen Exp $
ONLY_FOR_ARCHS= amd64 i386
USE_LLD= No
# XXX errors with clang -
# ./src/string.c:24:16: error: invalid output constraint '=Qi' in asm
@ -43,13 +44,8 @@ EXTRAVERSION= p${REVISION}-OpenBSD-vmm
EXTRAVERSION= -OpenBSD-vmm
.endif
LD= ld.bfd
CFLAGS+= -fuse-ld=bfd
MAKE_FLAGS= EXTRAVERSION="${EXTRAVERSION}" \
PYTHON="${MODPY_BIN}" \
V=1 \
LD32BIT_FLAG=-melf_i386_obsd \
LD="${LD} -nopie -znorelro"
MAKE_FLAGS= PYTHON="${MODPY_BIN}" V=1 EXTRAVERSION="${EXTRAVERSION}" \
LD32BIT_FLAG=-melf_i386_obsd LD="${LD} -nopie -znorelro"
post-extract:
mv ${WRKDIR}/sgabios-* ${WRKDIR}/sgabios
@ -58,7 +54,7 @@ post-extract:
post-build:
sed -i 's,^#define BUILD_CL.*,#define BUILD_CL "${SB_VER}",' \
${WRKDIR}/sgabios/sgabios.S
cd ${WRKDIR}/sgabios; env ${MAKE_ENV} ${MAKE_PROGRAM} LD=${LD} \
cd ${WRKDIR}/sgabios; env ${MAKE_ENV} ${MAKE_PROGRAM} \
BUILD_USER='\"_<vmm\"' BUILD_HOST='\"OpenBSD>\"'
dd if=/dev/zero of=${WRKDIR}/space bs=1 count=196608
cat ${WRKDIR}/sgabios/sgabios.bin ${WRKDIR}/space \