diff options
| author |   robert <robert@openbsd.org> | 2017-08-09 06:15:29 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2017-08-09 06:15:29 +0000 |
| commit | a6ea88c3ecfdbc74694973e1e4baa484aaabf2d4 (patch) | |
| tree | a15090af7409f0904f71ebc093abb3fcfe201621 | |
| parent | Fix format strings to make the kernel build on arm64 again after the (diff) | |
| download | wireguard-openbsd-a6ea88c3ecfdbc74694973e1e4baa484aaabf2d4.tar.xz wireguard-openbsd-a6ea88c3ecfdbc74694973e1e4baa484aaabf2d4.zip | |
switch the order of substitutions for syspatch object file order to avoid
deleting ../ in the path
| -rw-r--r-- | share/mk/bsd.lib.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index c5b4e1eea70..cf6fdb0832c 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.89 2017/07/25 13:32:14 robert Exp $ +# $OpenBSD: bsd.lib.mk,v 1.90 2017/08/09 06:15:29 robert Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -213,8 +213,8 @@ ${FULLSHLIBNAME}: ${SOBJS} ${DPADD} .if defined(SYSPATCH_PATH) ${CC} -shared ${PICFLAG} -o ${.TARGET} \ `readelf -Ws ${SYSPATCH_PATH}${LIBDIR}/${.TARGET} | \ - awk '/ FILE/{gsub(/\..*/, ".so", $$NF); sub(".*/", "", $$NF); print $$NF}' | \ - egrep -v "(cmll-586|libgcc2|unwind-dw2)" | awk '!x[$$0]++'` ${LDADD} + awk '/ FILE/{sub(".*/", "", $$NF); gsub(/\..*/, ".so", $$NF); print $$NF}' | \ + egrep -v "(cmll-586|libgcc2|unwind-dw2|mul(d|s|x)c3)" | awk '!x[$$0]++'` ${LDADD} .else ${CC} -shared ${PICFLAG} -o ${.TARGET} \ `echo ${SOBJS} | tr ' ' '\n' | sort -R` ${LDADD} |