jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 10:52:50 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

WITHOUT_TOOLCHAIN: Fix build of rtld.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2016-03-31 17:27:01 +00:00
parent c4563b16f5
commit c0f5aeb032
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=297461
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libc/Makefile
View File

@ -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

3
libexec/rtld-elf/Makefile
View File

@ -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