From d392c399e5720bb319b7041bf59e57f37afeac0e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Mon, 10 Dec 2012 09:08:12 +0000 Subject: [PATCH] Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER. 2012-12-10 Matthias Klose * src/Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER. * src/Makefile.in: Regenerate. From-SVN: r194346 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/src/Makefile.am | 2 +- libstdc++-v3/src/Makefile.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c478e94b7ae..1c29664a532 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2012-12-10 Matthias Klose + + * src/Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER. + * src/Makefile.in: Regenerate. + 2012-12-09 Andreas Schwab * testsuite/lib/libstdc++.exp (dg-test): Unset testname_with_flags diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index d76318eae89..b367c3f9594 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -196,7 +196,7 @@ libstdc++-symbols.ver: ${glibcxx_srcdir}/$(SYMVER_FILE) \ fi; \ fi $(EGREP) -v '^[ ]*#(#| |$$)' $@.tmp | \ - $(CC) -E -P -include ../config.h - > $@ || (rm -f $@ ; exit 1) + $(CC) -E -P -include $(CONFIG_HEADER) - > $@ || (rm -f $@ ; exit 1) rm -f $@.tmp CLEANFILES = libstdc++-symbols.ver diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index f9ff31943e9..69001b4bf47 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -865,7 +865,7 @@ compatibility-thread-c++0x.o: compatibility-thread-c++0x.cc @ENABLE_SYMVERS_TRUE@ fi; \ @ENABLE_SYMVERS_TRUE@ fi @ENABLE_SYMVERS_TRUE@ $(EGREP) -v '^[ ]*#(#| |$$)' $@.tmp | \ -@ENABLE_SYMVERS_TRUE@ $(CC) -E -P -include ../config.h - > $@ || (rm -f $@ ; exit 1) +@ENABLE_SYMVERS_TRUE@ $(CC) -E -P -include $(CONFIG_HEADER) - > $@ || (rm -f $@ ; exit 1) @ENABLE_SYMVERS_TRUE@ rm -f $@.tmp @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@libstdc++-symbols.ver-sun : libstdc++-symbols.ver \ @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@ $(toplevel_srcdir)/contrib/make_sunver.pl \ -- 2.11.4.GIT