From: Tom Tromey <tromey@redhat.com>
Date: Wed, 2 Oct 2013 18:46:18 +0000 (+0000)
Subject: * Makefile.in (DRIVER_DEFINES): Use $(if), not $(and).
X-Git-Tag: releases/gcc-4.9.0~3746
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56e82b14747c3d14a9e2ffec324aa338f0693020;p=thirdparty%2Fgcc.git

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

From-SVN: r203125
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a64f5fc8d472..4578a605c25f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-02  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in (DRIVER_DEFINES): Use $(if), not $(and).
+
 2013-10-02  Andrew MacLeod  <amacleod@redhat.com>
 
 	* tree-flow.h: Remove some prototypes.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index f55f1d15a9ce..20516cb99f6f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1925,7 +1925,7 @@ DRIVER_DEFINES = \
   -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)