diff options
| author | Matthias Klose <doko@ubuntu.com> | 2012-12-10 09:08:12 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2012-12-10 09:08:12 +0000 |
| commit | bbcf1fbb4a5d7ff85a86e47b62035ae524876c81 (patch) | |
| tree | 55404a693e29eccf8a03b96a2a15ab1c9ee8ae48 | |
| parent | 746bf44c5f4d438cbf41528ebdd98dc700ea5d00 (diff) | |
2012-12-10 Matthias Klose <doko@ubuntu.com>
* src/Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER.
* src/Makefile.in: Regenerate.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@194346 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 <doko@ubuntu.com> + + * src/Makefile.am (libstdc++-symbols.ver): Use CONFIG_HEADER. + * src/Makefile.in: Regenerate. + 2012-12-09 Andreas Schwab <schwab@linux-m68k.org> * 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 \ |