diff options
author | DJ Delorie <dj@delorie.com> | 2008-10-16 02:47:08 +0000 |
---|---|---|
committer | DJ Delorie <dj@delorie.com> | 2008-10-16 02:47:08 +0000 |
commit | 4851fb19aaee7b62cc7daef87c39ff1dfb5bc5bc (patch) | |
tree | 63be2c9d264eb02874195c21de3f86ab78e1d55f | |
parent | 90ed338e507450536a55f0b0e942f72a653f5b47 (diff) | |
download | binutils-redhat-4851fb19aaee7b62cc7daef87c39ff1dfb5bc5bc.tar.gz |
merge from gcc
-rw-r--r-- | libiberty/ChangeLog | 7 | ||||
-rw-r--r-- | libiberty/Makefile.in | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 955e55003d..e1a744c036 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,10 @@ +2008-10-15 Paolo Bonzini <bonzini@gnu.org> + + PR bootstrap/37137 + * Makefile.in (LIBCFLAGS): Remove. + (FLAGS_TO_PASS): Don't mention it. + (COMPILE.c, MULTIOSDIR): Replace it with CFLAGS. + 2008-10-08 David Edelsohn <edelsohn@gnu.org> * xstrdup.c: Include <sys/types.h> after "config.h" diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index e18aff7536..aa8626d5c0 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -55,7 +55,6 @@ AR_FLAGS = rc CC = @CC@ CFLAGS = @CFLAGS@ -LIBCFLAGS = $(CFLAGS) RANLIB = @RANLIB@ MAKEINFO = @MAKEINFO@ PERL = @PERL@ @@ -80,7 +79,6 @@ FLAGS_TO_PASS = \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ "DESTDIR=$(DESTDIR)" \ - "LIBCFLAGS=$(LIBCFLAGS)" \ "EXTRA_OFILES=$(EXTRA_OFILES)" \ "HDEFINES=$(HDEFINES)" \ "INSTALL=$(INSTALL)" \ @@ -111,7 +109,7 @@ installcheck: installcheck-subdir INCDIR=$(srcdir)/$(MULTISRCTOP)../include -COMPILE.c = $(CC) -c @DEFS@ $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@ +COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@ # Just to make sure we don't use a built-in rule with VPATH .c.o: @@ -350,9 +348,9 @@ install: install_to_$(INSTALL_DEST) install-subdir # This is tricky. Even though CC in the Makefile contains # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the -# default multilib, so we have to take LIBCFLAGS into account as well, +# default multilib, so we have to take CFLAGS into account as well, # since it will be passed the multilib flags. -MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory` +MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` install_to_libdir: all ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR) $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n |