diff options
| author | peter <peter@FreeBSD.org> | 2013-11-25 20:17:55 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2013-11-25 20:17:55 +0000 |
| commit | 7174132ba07556bba4cfd9573bc48b02509197cf (patch) | |
| tree | 3cdb945259787011c7003b323aa08a57a6e4fee1 /lib/libc/Makefile | |
| parent | a85533ccfd293b610eaa07a2d5cc479590fc60e7 (diff) | |
| download | FreeBSD-src-7174132ba07556bba4cfd9573bc48b02509197cf.zip FreeBSD-src-7174132ba07556bba4cfd9573bc48b02509197cf.tar.gz | |
Move the iconv wrapper source from libc_nonshared to libc/iconv so that
it is all in the one place again. Rename libc/iconv/iconv.c to
bsd_iconv.c. Compile the wrappers into libc.a so that WITHOUT_DYNAMICROOT
works again.
Discussed with: kib (and partly stolen from his patch)
Diffstat (limited to 'lib/libc/Makefile')
| -rw-r--r-- | lib/libc/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 2806cc7..04235a2 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -50,6 +50,9 @@ LDADD+= -lgcc LDADD+= -lssp_nonshared .endif +# Extras that live in either libc.a or libc_nonshared.a +LIBC_NONSHARED_SRCS= + # Define (empty) variables so that make doesn't give substitution # errors if the included makefiles don't change these: MDSRCS= @@ -114,6 +117,8 @@ CFLAGS+= -DNS_CACHING CFLAGS+=-D_FREEFALL_CONFIG .endif +STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/} + VERSION_DEF=${.CURDIR}/Versions.def SYMBOL_MAPS=${SYM_MAPS} CFLAGS+= -DSYMBOL_VERSIONING |
