diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-23 10:15:50 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2003-03-23 10:15:50 +0000 |
| commit | 9f2e060862c74c08d3468799e4070b98d9432da0 (patch) | |
| tree | 1d6c6a57c74e2a43617ea20058375fe59b5ac736 /libiberty | |
| parent | 7772f0a9977adfb2b711979e329a01bdf7ebf9cf (diff) | |
| download | gcc-9f2e060862c74c08d3468799e4070b98d9432da0.zip gcc-9f2e060862c74c08d3468799e4070b98d9432da0.tar.gz gcc-9f2e060862c74c08d3468799e4070b98d9432da0.tar.bz2 | |
Makefile.in (MULTIOSDIR): New macro.
* Makefile.in (MULTIOSDIR): New macro. Use $(CC) $(LIBCFLAGS)
instead of $$CC alone.
(install_to_tooldir): Use it.
From-SVN: r64745
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index d4b84d3..0fe3e78 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2003-03-23 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (MULTIOSDIR): New macro. Use $(CC) $(LIBCFLAGS) + instead of $$CC alone. + (install_to_tooldir): Use it. + 2003-17-03 Jan Hubicka <jh@suse.cz> * hashtab.c (htab_traverse_noresize): Break out from ... diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 0641796..737d239 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -286,11 +286,16 @@ install_to_libdir: all fi @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install +# 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, +# since it will be passed the multilib flags. +MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory` install_to_tooldir: all - ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` - $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n - ( cd $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` ; $(RANLIB) $(TARGETLIB)n ) - mv -f $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB) + ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n + ( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; $(RANLIB) $(TARGETLIB)n ) + mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB) @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install # needed-list is used by libstdc++. NEEDED is the list of functions |