diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2005-11-30 16:57:37 +0000 |
|---|---|---|
| committer | Paolo Carlini <pcarlini@suse.de> | 2005-11-30 16:57:37 +0000 |
| commit | 1637ac6482346bdb17f189ffd7157adf39ae2795 (patch) | |
| tree | 13c7634f2d6d34effb10b392d62c8708d0a79cd0 /libstdc++-v3/src/Makefile.am | |
| parent | 27182b4e2e79e6e26c5c38b992fd66dda5a3eae4 (diff) | |
2005-11-30 Paolo Carlini <pcarlini@suse.de>
Merged to mainline at revision 107719.
(left out Darwin compatibility patch)
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/libstdcxx_so_7-branch@107722 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/Makefile.am')
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 20d3fda9ce3..993cf21234f 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -32,6 +32,7 @@ if ENABLE_SYMVERS_GNU version_arg = -Wl,--version-script=libstdc++-symbol.ver version_dep = libstdc++-symbol.ver libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP) + cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver if test "x$(port_specific_symbol_files)" != x; then \ sed -n '1,/DO NOT DELETE/p' $@ > tmp.top; \ @@ -39,6 +40,7 @@ libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP) cat tmp.top $(port_specific_symbol_files) tmp.bottom > $@; \ rm tmp.top tmp.bottom; \ fi + else if ENABLE_SYMVERS_DARWIN_EXPORT version_arg = -Wl,-exported_symbols_list,libstdc++-symbol.explist @@ -172,7 +174,6 @@ libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD) libstdc___la_LDFLAGS = \ -version-info $(libtool_VERSION) ${version_arg} -lm - # Use special rules for the deprecated source files so that they find # deprecated include files. GLIBCXX_INCLUDE_DIR=$(glibcxx_builddir)/include @@ -220,7 +221,7 @@ AM_CXXFLAGS = \ # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to # attempt to infer which configuration to use LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) # 3) We'd have a problem when building the shared libstdc++ object if # the rules automake generates would be used. We cannot allow g++ to |