svn commit: r297461 - in head: lib/libc libexec/rtld-elf

[Bryan Drewery]

Author: bdrewery
Date: Thu Mar 31 17:27:01 2016
New Revision: 297461
URL: https://svnweb.freebsd.org/changeset/base/297461

Log:
  WITHOUT_TOOLCHAIN: Fix build of rtld.
  
  MK_TOOLCHAIN==no disables building and installing of pic archives.
  c_pic.a is still needed for rtld though so force it to build in lib/libc
  and link directly to the objdir version of it for rtld.
  
  Somehow this has been broken since r148725.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/lib/libc/Makefile
  head/libexec/rtld-elf/Makefile

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Thu Mar 31 17:15:03 2016	(r297460)
+++ head/lib/libc/Makefile	Thu Mar 31 17:27:01 2016	(r297461)
@@ -5,6 +5,9 @@ SHLIBDIR?= /lib
 
 .include <src.opts.mk>
 
+# Force building of libc_pic.a
+MK_TOOLCHAIN=	yes
+
 LIBC_SRCTOP?= ${.CURDIR}
 
 # Pick the current architecture directory for libc. In general, this is

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Thu Mar 31 17:15:03 2016	(r297460)
+++ head/libexec/rtld-elf/Makefile	Thu Mar 31 17:27:01 2016	(r297461)
@@ -45,6 +45,9 @@ CFLAGS+=	-fvisibility=hidden
 .endif
 LDFLAGS+=	-shared -Wl,-Bsymbolic
 LIBADD=		c_pic
+.if ${MK_TOOLCHAIN} == "no"
+LDFLAGS+=	-L${LIBCDIR}
+.endif
 
 .if ${MACHINE_CPUARCH} == "arm"
 # Some of the required math functions (div & mod) are implemented in