diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2004-01-12 22:15:07 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2004-01-12 22:15:07 +0000 |
| commit | f24d8e0162ba300bdcc4f4a4577071b11ec6fefb (patch) | |
| tree | 48bf63c8304378eb754bdc6ccdd64051719b348f | |
| parent | 58a7053ee4b7d4ab689ae1b2873f182a492c72d9 (diff) | |
better fix for non-versioned rebuild bug: backport from gcc HEAD,
submitted for the 3.3 branch.
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/src/Makefile.am | 5 | ||||
| -rw-r--r-- | gnu/lib/libstdc++/libstdc++/src/Makefile.in | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gnu/lib/libstdc++/libstdc++/src/Makefile.am b/gnu/lib/libstdc++/libstdc++/src/Makefile.am index 304c035defc..199bb65521f 100644 --- a/gnu/lib/libstdc++/libstdc++/src/Makefile.am +++ b/gnu/lib/libstdc++/libstdc++/src/Makefile.am @@ -38,11 +38,12 @@ toolexeclib_LTLIBRARIES = libstdc++.la # Symbol versioning for shared libraries. if GLIBCPP_BUILD_VERSIONED_SHLIB version_arg = -Wl,--version-script=libstdc++-symbol.ver +version_dep = libstdc++-symbol.ver libstdc++-symbol.ver: ${glibcpp_srcdir}/@SYMVER_MAP@ @LN_S@ ${glibcpp_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true else version_arg = -libstdc++-symbol.ver: +version_dep = endif # Compile flags that should be constant throughout the build, both for @@ -156,7 +157,7 @@ libstdc___la_LIBADD = \ $(top_builddir)/libmath/libmath.la @libio_la@ \ $(top_builddir)/libsupc++/libsupc++convenience.la -libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) +libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ -version-info @libtool_VERSION@ ${version_arg} \ diff --git a/gnu/lib/libstdc++/libstdc++/src/Makefile.in b/gnu/lib/libstdc++/libstdc++/src/Makefile.in index f67f7e09a58..50aa12541f0 100644 --- a/gnu/lib/libstdc++/libstdc++/src/Makefile.in +++ b/gnu/lib/libstdc++/libstdc++/src/Makefile.in @@ -148,6 +148,8 @@ toolexeclibdir = @glibcpp_toolexeclibdir@ toolexeclib_LTLIBRARIES = libstdc++.la @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=libstdc++-symbol.ver @GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg = +@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_dep = libstdc++-symbol.ver +@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_dep = # Compile flags that should be constant throughout the build, both for # SUBDIRS and for libstdc++-v3 in general. @@ -240,7 +242,7 @@ libstdc___la_LIBADD = \ $(top_builddir)/libsupc++/libsupc++convenience.la -libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) +libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ -version-info @libtool_VERSION@ ${version_arg} \ @@ -543,8 +545,6 @@ mostlyclean distclean maintainer-clean @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver: ${glibcpp_srcdir}/@SYMVER_MAP@ @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@ @LN_S@ ${glibcpp_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true -@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver: -@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@ touch $@ codecvt_members.cc: ${glibcpp_srcdir}/@CCODECVT_CC@ @LN_S@ ${glibcpp_srcdir}/@CCODECVT_CC@ . || true |