diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2004-05-20 20:17:04 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@gcc.gnu.org> | 2004-05-20 20:17:04 +0000 |
| commit | 4ac29b33742d45c8cdc4da91b6e994d6cc49e79a (patch) | |
| tree | aa1696f923df5de3d94fc1cad241d846ab7d5862 | |
| parent | 8be123d4a969fb67c7d46754bec8a51de680c97a (diff) | |
| download | gcc-4ac29b33742d45c8cdc4da91b6e994d6cc49e79a.zip gcc-4ac29b33742d45c8cdc4da91b6e994d6cc49e79a.tar.gz gcc-4ac29b33742d45c8cdc4da91b6e994d6cc49e79a.tar.bz2 | |
* Makefile.in (AR_FOR_TARGET, RANLIB_FOR_TARGET)
(NM_FOR_TARGET): Use := and $(shell).
(mainversion): Remove unused variable.
From-SVN: r82068
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e2f3425..3d81b8a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-05-20 Daniel Jacobowitz <dan@debian.org> + + * Makefile.in (AR_FOR_TARGET, RANLIB_FOR_TARGET) + (NM_FOR_TARGET): Use := and $(shell). + (mainversion): Remove unused variable. + 2004-05-20 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> * reorg.c (delete_from_delay_slot): If we have a barrier after the diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 35f8bcb..a178995 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -316,7 +316,7 @@ GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(LOOSE_WARN) -Wold-style- # Programs which produce files for the target machine # --------------------------------------------------- -AR_FOR_TARGET = ` \ +AR_FOR_TARGET := $(shell \ if [ -f $(objdir)/../binutils/ar ] ; then \ echo $(objdir)/../binutils/ar ; \ else \ @@ -325,11 +325,11 @@ AR_FOR_TARGET = ` \ else \ t='$(program_transform_name)'; echo ar | sed -e $$t ; \ fi; \ - fi` + fi) AR_FLAGS_FOR_TARGET = AR_CREATE_FOR_TARGET = $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) rc AR_EXTRACT_FOR_TARGET = $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) x -RANLIB_FOR_TARGET = ` \ +RANLIB_FOR_TARGET := $(shell \ if [ -f $(objdir)/../binutils/ranlib ] ; then \ echo $(objdir)/../binutils/ranlib ; \ else \ @@ -338,8 +338,8 @@ RANLIB_FOR_TARGET = ` \ else \ t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \ fi; \ - fi` -NM_FOR_TARGET = ` \ + fi) +NM_FOR_TARGET := $(shell \ if [ -f ./nm ] ; then \ echo ./nm ; \ elif [ -f $(objdir)/../binutils/nm-new ] ; then \ @@ -350,7 +350,7 @@ NM_FOR_TARGET = ` \ else \ t='$(program_transform_name)'; echo nm | sed -e $$t ; \ fi; \ - fi` + fi) # -------- # UNSORTED @@ -416,7 +416,6 @@ host_hook_obj=@out_host_hook_obj@ gcc_version=@gcc_version@ gcc_version_trigger=@gcc_version_trigger@ version=$(gcc_version) -mainversion=`grep version_string $(srcdir)/version.c | sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/'` # ------------------------ # Installation directories |