Date: Thu, 17 May 2012 20:38:02 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r235566 - head/gnu/lib/csu Message-ID: <201205172038.q4HKc2HM016086@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Thu May 17 20:38:01 2012 New Revision: 235566 URL: http://svn.freebsd.org/changeset/base/235566 Log: Build the "S" objects with the same name they get installed under. That is, build crtbeginS.o and crtendS.o instead of crtbegin.So and crtend.So. Remove the name substitution during install. Obtained from: Juniper Networks, Inc. Modified: head/gnu/lib/csu/Makefile Modified: head/gnu/lib/csu/Makefile ============================================================================== --- head/gnu/lib/csu/Makefile Thu May 17 20:29:15 2012 (r235565) +++ head/gnu/lib/csu/Makefile Thu May 17 20:38:01 2012 (r235566) @@ -12,7 +12,7 @@ CCDIR= ${.CURDIR}/../../usr.bin/cc SRCS= crtstuff.c tconfig.h tm.h options.h OBJS= crtbegin.o crtend.o crtbeginT.o -SOBJS= crtbegin.So crtend.So +SOBJS= crtbeginS.o crtendS.o CSTD?= gnu89 CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR -DDT_CONFIG -D__GLIBC__=3 CFLAGS+= -finhibit-size-directive -fno-inline-functions \ @@ -55,7 +55,7 @@ crtbeginT.o: ${BEGINSRC} ${CC} ${CFLAGS} -g0 -DCRT_BEGIN -DCRTSTUFFT_O \ -c -o ${.TARGET} ${.ALLSRC:N*.h} -crtbegin.So: ${BEGINSRC} +crtbeginS.o: ${BEGINSRC} ${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${.ALLSRC:N*.h} @@ -63,7 +63,7 @@ crtend.o: ${ENDSRC} ${CC} ${CFLAGS} -g0 -DCRT_END \ -c -o ${.TARGET} ${.ALLSRC:N*.h} -crtend.So: ${ENDSRC} +crtendS.o: ${ENDSRC} ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${.ALLSRC:N*.h} @@ -74,7 +74,7 @@ tm.h tconfig.h options.h: ${CCDIR}/cc_to realinstall: .for file in ${OBJS} ${SOBJS} ${TGTOBJS} ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/} + ${file} ${DESTDIR}${LIBDIR}/${file} .endfor .include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205172038.q4HKc2HM016086>