summaryrefslogtreecommitdiff
path: root/libstdc++-v3/src/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/src/Makefile.in')
-rw-r--r--libstdc++-v3/src/Makefile.in17
1 files changed, 1 insertions, 16 deletions
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index c55e7566cc5..de7f3e9567a 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -324,7 +324,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir)
@ENABLE_EXTERN_TEMPLATE_FALSE@XTEMPLATE_FLAGS =
@ENABLE_EXTERN_TEMPLATE_TRUE@XTEMPLATE_FLAGS = -fno-implicit-templates
@ENABLE_VTABLE_VERIFY_FALSE@VTV_CXXLINKFLAGS =
-@ENABLE_VTABLE_VERIFY_TRUE@VTV_CXXLINKFLAGS = -L$(top_builddir)/libsupc++/.libs --whole-archive -lvtv_init --no-whole-archive
+@ENABLE_VTABLE_VERIFY_TRUE@VTV_CXXLINKFLAGS = "-Wl,-lvtv"
@ENABLE_VTABLE_VERIFY_FALSE@VTV_CXXFLAGS =
@ENABLE_VTABLE_VERIFY_TRUE@VTV_CXXFLAGS = -fvtable-verify=std \
@ENABLE_VTABLE_VERIFY_TRUE@ -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
@@ -375,24 +375,9 @@ libstdc___la_DEPENDENCIES = \
$(top_builddir)/src/c++98/libc++98convenience.la \
$(top_builddir)/src/c++11/libc++11convenience.la
-
-#if ENABLE_VTABLE_VERIFY
-#libstdc___la_LDFLAGS = \
-# -version-info $(libtool_VERSION) ${version_arg} -lm -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
-#
-#libvtv___la_LIBADD = \
-# $(top_builddir)/libsupc++/.libs
-#LIBVTV_FLAGS = \
-# -L$(libvtv___la_LIBADD) --whole-archive -lvtv_init --no-whole-archive
-#VTV_CXXFLAGS = -fvtable-verify=std
-#else
libstdc___la_LDFLAGS = \
-version-info $(libtool_VERSION) ${version_arg} -lm
-#libvtv___la_LIBADD =
-#LIBVTV_FLAGS =
-#VTV_CXXFLAGS =
-#endif
libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
# A note on compatibility and static libraries.