summaryrefslogtreecommitdiff
path: root/libstdc++-v3/src/c++98/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/src/c++98/Makefile.in')
-rw-r--r--libstdc++-v3/src/c++98/Makefile.in18
1 files changed, 1 insertions, 17 deletions
diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in
index a6af8002619..8c60e596f4f 100644
--- a/libstdc++-v3/src/c++98/Makefile.in
+++ b/libstdc++-v3/src/c++98/Makefile.in
@@ -307,7 +307,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
@@ -407,22 +407,6 @@ sources = \
libc__98convenience_la_SOURCES = $(sources)
-# We need to add this here because even thought the GCC driver normally would
-# add the flags below when doing a vtable-verification build, the driver
-# flags do not appear to be used when building the C++ std library.
-
-#if ENABLE_VTABLE_VERIFY
-#EXTRA_VTV_LDFLAGS = \
-# -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end
-#LIBVTV_FLAGS = \
-# -L$(top_builddir)/libsupc++/.libs --whole-archive -lvtv_init --no-whole-archive
-#VTV_CXXFLAGS = -fvtable-verify=std $(EXTRA_VTV_LDFLAGS)
-#else
-#EXTRA_VTV_LDFLAGS =
-#LIBVTV_FLAGS =
-#VTV_CXXFLAGS =
-#endif
-
# Use special rules for the deprecated source files so that they find
# deprecated include files.
GLIBCXX_INCLUDE_DIR = $(glibcxx_builddir)/include