diff options
| author | marcel <marcel@FreeBSD.org> | 2012-05-17 20:38:01 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2012-05-17 20:38:01 +0000 |
| commit | 3ba6deabb69f4bce9eabe66606bbdb1800a8e489 (patch) | |
| tree | 9399be1bf830c06bb1032e62c8b1a614c4a0e26b | |
| parent | 6bbc518f3024e03376c57ea63fed939c5a1268c7 (diff) | |
| download | FreeBSD-src-3ba6deabb69f4bce9eabe66606bbdb1800a8e489.zip FreeBSD-src-3ba6deabb69f4bce9eabe66606bbdb1800a8e489.tar.gz | |
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.
| -rw-r--r-- | gnu/lib/csu/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index 4999d06..a65be66 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -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_tools/Makefile 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> |
