diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-10-02 18:46:18 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2013-10-02 18:46:18 +0000 |
| commit | 56e82b14747c3d14a9e2ffec324aa338f0693020 (patch) | |
| tree | 7232fab2b8a22665366fe577c9363045cfacc559 | |
| parent | 6bd32cb27515fc622aa00f2e36383eb172fa7c70 (diff) | |
| download | gcc-56e82b14747c3d14a9e2ffec324aa338f0693020.zip gcc-56e82b14747c3d14a9e2ffec324aa338f0693020.tar.gz gcc-56e82b14747c3d14a9e2ffec324aa338f0693020.tar.bz2 | |
* Makefile.in (DRIVER_DEFINES): Use $(if), not $(and).
From-SVN: r203125
| -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 a64f5fc..4578a60 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 f55f1d1..20516cb 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) |