Skip to content

Commit

Permalink
Remove several explicit rules. The two for exceptioni.o and typeionfoi.o
Browse files Browse the repository at this point in the history
aren't needed as those files aren't part of libstdc++ any longer.  Another
isn't needed as Cygnus doesn't compile with -frtti.

Noticed by:	bde & my initial mispelling of ".So".
  • Loading branch information
obrien authored and obrien committed Apr 25, 1999
1 parent 9e1b368 commit e227e38
Showing 1 changed file with 1 addition and 43 deletions.
44 changes: 1 addition & 43 deletions gnu/lib/libstdc++/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# $Id: Makefile,v 1.18 1999/04/08 09:13:39 obrien Exp $
# $Id: Makefile,v 1.19 1999/04/15 08:08:56 obrien Exp $
#

EGCSDIR= ${.CURDIR}/../../../contrib/egcs
Expand All @@ -20,8 +20,6 @@ CXXFLAGS+= -nostdinc++ -fno-implicit-templates
LDADD+= -lm
DPADD+= ${LIBM}

DIR= ${EGCSDIR}/libstdc++

HDRS= cassert cctype cerrno cfloat ciso646 climits clocale cmath complex \
csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime \
cwchar cwctype fstream iomanip iosfwd iostream stdexcept string \
Expand Down Expand Up @@ -87,46 +85,6 @@ CLEANFILES+= dummy.h dummy.c dummy.C

# Lots of special cases

# ======== typeinfoi.o, stdexcepti.o ========
.for file in typeinfoi stdexcepti
CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp
${file}.o: ${file}.cc
${CXX} -nostdinc++ ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}

${file}.So: ${file}.cc
${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc \
-o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}

${file}.po: ${file}.cc
${CXX} -p ${CXXFLAGS} -frtti -c ${DIR}/${file}.cc -o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}
.endfor

# ======== exceptioni.o ========
.for file in exceptioni
CLEANFILES+= ${file}.o.tmp ${file}.po.tmp ${file}.so.tmp
${file}.o: ${file}.cc
${CXX} ${CXXFLAGS} -O0 -c ${DIR}/${file}.cc -o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}

${file}.So: ${file}.cc
${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -O0 -c ${DIR}/${file}.cc \
-o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}

${file}.po: ${file}.cc
${CXX} -p ${CXXFLAGS} -O0 -c ${DIR}/${file}.cc -o ${.TARGET}
@${LD} -o ${.TARGET}.tmp -X -r ${.TARGET}
@mv ${.TARGET}.tmp ${.TARGET}
.endfor

# ======== cstrmain.o ========
SRCS+= cstrmain.cc
CLEANFILES+= cstrmain.cc
Expand Down

0 comments on commit e227e38

Please sign in to comment.