diff mbox

RFA: GNU make 3.80 compatibility

Message ID 877gdv3483.fsf@fleche.redhat.com
State New
Headers show

Commit Message

Tom Tromey Oct. 2, 2013, 6:41 p.m. UTC
This patch makes the automatic dependency tracking code compatible with
GNU make 3.80, which is documented as the oldest supported version.
This was noticed by Eric Botcazou:

    http://gcc.gnu.org/ml/gcc/2013-09/msg00243.html

Ok?

Tom

2013-10-02  Tom Tromey  <tromey@redhat.com>

	* Makefile.in (DRIVER_DEFINES): Use $(if), not $(and).

Comments

Jakub Jelinek Oct. 2, 2013, 6:44 p.m. UTC | #1
On Wed, Oct 02, 2013 at 12:41:32PM -0600, Tom Tromey wrote:
> This patch makes the automatic dependency tracking code compatible with
> GNU make 3.80, which is documented as the oldest supported version.
> This was noticed by Eric Botcazou:
> 
>     http://gcc.gnu.org/ml/gcc/2013-09/msg00243.html
> 
> Ok?
> 
> Tom
> 
> 2013-10-02  Tom Tromey  <tromey@redhat.com>
> 
> 	* Makefile.in (DRIVER_DEFINES): Use $(if), not $(and).

Ok, thanks.

> --- Makefile.in	(revision 203124)
> +++ Makefile.in	(working copy)
> @@ -1925,7 +1925,7 @@
>    -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \
>    @TARGET_SYSTEM_ROOT_DEFINE@ \
>    $(VALGRIND_DRIVER_DEFINES) \
> -  $(and $(SHLIB),$(filter yes,@enable_shared@),-DENABLE_SHARED_LIBGCC) \
> +  $(if $(SHLIB),$(if $(filter yes,@enable_shared@),-DENABLE_SHARED_LIBGCC)) \
>    -DCONFIGURE_SPECS="\"@CONFIGURE_SPECS@\""
>  
>  CFLAGS-gcc.o += $(DRIVER_DEFINES)

	Jakub
diff mbox

Patch

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 203124)
+++ Makefile.in	(working copy)
@@ -1925,7 +1925,7 @@ 
   -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \
   @TARGET_SYSTEM_ROOT_DEFINE@ \
   $(VALGRIND_DRIVER_DEFINES) \
-  $(and $(SHLIB),$(filter yes,@enable_shared@),-DENABLE_SHARED_LIBGCC) \
+  $(if $(SHLIB),$(if $(filter yes,@enable_shared@),-DENABLE_SHARED_LIBGCC)) \
   -DCONFIGURE_SPECS="\"@CONFIGURE_SPECS@\""
 
 CFLAGS-gcc.o += $(DRIVER_DEFINES)