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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@203125 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a64f5fc8d472828935ac4e16d29107db294876a0..4578a605c25fd74710433c1953701e8a4f29206b 100644 (file)
--- 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 f55f1d15a9ceba85e0897b84fb7eb2b6049466b0..20516cb99f6f54b1c8acf84c87faed9fa8208add 100644 (file)
--- 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)