Date: Thu, 8 Feb 2018 22:59:51 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329050 - in head/stand: . userboot/userboot Message-ID: <201802082259.w18MxpwL015223@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Feb 8 22:59:51 2018 New Revision: 329050 URL: https://svnweb.freebsd.org/changeset/base/329050 Log: Fix build of userboot.so Since it's not possible to unset a variable easily, create a new variable 'PIC' to signal that we are creating a shared object that we want to install. defs.mk refains from defining NO_PIC and ITNERALLIB when PIC is defined. This unbreaks userboot.so building. Modified: head/stand/defs.mk head/stand/userboot/userboot/Makefile Modified: head/stand/defs.mk ============================================================================== --- head/stand/defs.mk Thu Feb 8 22:38:39 2018 (r329049) +++ head/stand/defs.mk Thu Feb 8 22:59:51 2018 (r329050) @@ -10,9 +10,11 @@ __BOOT_DEFS_MK__=${MFILE} MK_CTF= no MK_SSP= no MK_PROFILE= no -NO_PIC= MAN= +.if !defined(PIC) +NO_PIC= INTERNALLIB= +.endif BOOTSRC= ${SRCTOP}/stand EFISRC= ${BOOTSRC}/efi Modified: head/stand/userboot/userboot/Makefile ============================================================================== --- head/stand/userboot/userboot/Makefile Thu Feb 8 22:38:39 2018 (r329049) +++ head/stand/userboot/userboot/Makefile Thu Feb 8 22:59:51 2018 (r329050) @@ -4,6 +4,7 @@ LOADER_MSDOS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no LOADER_EXT2FS_SUPPORT?= no +PIC=yes .include <bsd.init.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802082259.w18MxpwL015223>