diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a64f5fc8d47..4578a605c25 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 f55f1d15a9c..20516cb99f6 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) |