From fa246aa37ad88aeb6f12b93e67a4bd1516a084d6 Mon Sep 17 00:00:00 2001 From: Segher Boessenkool Date: Mon, 11 Apr 2016 09:26:36 +0200 Subject: [PATCH] libcc1: Clean compiler-name.h (PR70173) Since the file is generated from a Makefile fragment, it needs to be added to MOSTLYCLEANFILES. The directory itself is still not deleted (just like the gnattools and gotools directories). 2016-04-11 Segher Boessenkool libcc1/ PR bootstrap/70173 * Makefile.am (MOSTLYCLEANFILES): New, add compiler-name.h . (compiler-name.h): Shorten recipe so that it fits the line. * Makefile.in: Regenerate. From-SVN: r234874 --- libcc1/ChangeLog | 7 +++++++ libcc1/Makefile.am | 3 ++- libcc1/Makefile.in | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libcc1/ChangeLog b/libcc1/ChangeLog index 1efcb68e04b0..a65af09c6e66 100644 --- a/libcc1/ChangeLog +++ b/libcc1/ChangeLog @@ -1,3 +1,10 @@ +2016-04-11 Segher Boessenkool + + PR bootstrap/70173 + * Makefile.am (MOSTLYCLEANFILES): New, add compiler-name.h . + (compiler-name.h): Shorten recipe so that it fits the line. + * Makefile.in: Regenerate. + 2016-03-14 Andreas Schwab * configure.ac (CONFIG_STATUS_DEPENDENCIES): Substitute. diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am index 7a274b3470cf..b40820b21897 100644 --- a/libcc1/Makefile.am +++ b/libcc1/Makefile.am @@ -44,11 +44,12 @@ cc1lib_LTLIBRARIES = libcc1.la endif BUILT_SOURCES = compiler-name.h +MOSTLYCLEANFILES = compiler-name.h # Put this in a header so we don't run sed for each compilation. This # is also simpler to debug as one can easily see the constant. compiler-name.h: Makefile - echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > compiler-name.h + echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@ shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in index 9e0036823639..79d39d3f46a2 100644 --- a/libcc1/Makefile.in +++ b/libcc1/Makefile.in @@ -296,6 +296,7 @@ cc1libdir = $(libdir)/$(libsuffix) @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la BUILT_SOURCES = compiler-name.h +MOSTLYCLEANFILES = compiler-name.h shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \ marshall.cc marshall.hh rpc.hh status.hh @@ -563,6 +564,7 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: @@ -672,7 +674,7 @@ override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS)) # Put this in a header so we don't run sed for each compilation. This # is also simpler to debug as one can easily see the constant. compiler-name.h: Makefile - echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > compiler-name.h + echo "#define COMPILER_NAME \"`echo gcc | sed '$(transform)'`\"" > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -- 2.47.2