Module Name: src
Committed By: joerg
Date: Fri May 17 22:57:27 UTC 2013
Modified Files:
src/external/bsd/libc++/lib: Makefile
Log Message:
Prefer libcxxrt's typeinfo.cc. Do not use cxa_atexit.c, it is only for
Solaris. Do not use libcxxrt's memory.cc, the same content is already
provided by libc++ in new.cpp and that version agrees with the
overwriting rules for the operators from C++11.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libc++/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libc++/lib/Makefile
diff -u src/external/bsd/libc++/lib/Makefile:1.2 src/external/bsd/libc++/lib/Makefile:1.3
--- src/external/bsd/libc++/lib/Makefile:1.2 Tue Apr 30 00:34:15 2013
+++ src/external/bsd/libc++/lib/Makefile Fri May 17 22:57:27 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/04/30 00:34:15 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/17 22:57:27 joerg Exp $
LIB= c++
WARNS= 4
@@ -11,12 +11,15 @@ NOLINT= # defined
SRCS= algorithm.cpp bind.cpp chrono.cpp condition_variable.cpp debug.cpp \
exception.cpp future.cpp hash.cpp ios.cpp iostream.cpp locale.cpp \
memory.cpp mutex.cpp new.cpp random.cpp regex.cpp stdexcept.cpp \
- string.cpp strstream.cpp system_error.cpp thread.cpp typeinfo.cpp \
+ string.cpp strstream.cpp system_error.cpp thread.cpp \
utility.cpp valarray.cpp
+# typeinfo.cc: prefer libcxxrt's version
LIBCXXRT_SRCS+= \
- auxhelper.cc dynamic_cast.cc exception.cc guard.cc memory.cc \
- stdexcept.cc terminate.cc typeinfo.cc cxa_atexit.c libelftc_dem_gnu3.c
+ auxhelper.cc dynamic_cast.cc exception.cc guard.cc \
+ stdexcept.cc terminate.cc typeinfo.cc libelftc_dem_gnu3.c
+# cxa_atexit.c: Solaris-only
+# memory.cc: already provided by libc++'s new.cpp
.for src in ${LIBCXXRT_SRCS}
rt_${src}: ${LIBCXXRT_SRCDIR}/src/${src}
