summaryrefslogtreecommitdiff
path: root/c++tools
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2021-04-20 16:56:07 +0200
committerMartin Liska <mliska@suse.cz>2021-05-10 09:13:46 +0200
commite3a682f4197f9f39808febfd1862e722d7675d34 (patch)
treef4b4f7c6d8d8a37e96e0f2bde7e6f511619567ed /c++tools
parent79a27f32df8eab0add722f75332f78fe20d94da3 (diff)
downloadgcc-e3a682f4197f9f39808febfd1862e722d7675d34.tar.gz
Use genversion to generate version.h.
c++tools/ChangeLog: * Makefile.in: Include also ../gcc folder. gcc/ChangeLog: * Makefile.in: Rename gcov-iov to genversion and depend on version.h (instead of gcov-iov.h). * gcov-io.h: Include version.h instread of gcov-iov.h. * gengtype-state.c (read_state_version): Likewise. * gcov-iov.c: Moved to... * genversion.c: ...here. * lto-streamer.h (LTO_major_version): Define it with GCC_major_version. * version.c: Removed. * version.h: Removed. libgcc/ChangeLog: * libgcov-driver.c (gcov_version): Use different name that does not clash with newly introduced macro.
Diffstat (limited to 'c++tools')
-rw-r--r--c++tools/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/c++tools/Makefile.in b/c++tools/Makefile.in
index 9700706206d..afc87d07ad9 100644
--- a/c++tools/Makefile.in
+++ b/c++tools/Makefile.in
@@ -89,9 +89,9 @@ all::g++-mapper-server$(exeext)
MAPPER.O := server.o resolver.o
CODYLIB = ../libcody/libcody.a
-CXXINC += -I$(srcdir)/../libcody -I$(srcdir)/../include -I$(srcdir)/../gcc -I.
+CXXINC += -I$(srcdir)/../libcody -I$(srcdir)/../include -I$(srcdir)/../gcc -I. -I../gcc
g++-mapper-server$(exeext): $(MAPPER.O) $(CODYLIB)
- +$(CXX) $(LDFLAGS) $(PIEFLAG) -o $@ $^ $(VERSION.O) $(LIBIBERTY) $(NETLIBS)
+ +$(CXX) $(LDFLAGS) $(PIEFLAG) -o $@ $^ $(LIBIBERTY) $(NETLIBS)
# copy to gcc dir so tests there can run
all::../gcc/g++-mapper-server$(exeext)