summaryrefslogtreecommitdiff
path: root/libiberty/Makefile.in
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2003-03-23 10:16:44 +0000
committerAlexandre Oliva <aoliva@redhat.com>2003-03-23 10:16:44 +0000
commitacbb6e75646c3ba257fd6638ee6b4d58b7450f60 (patch)
tree3616741df55140bd8ccec05865910a3791e99d37 /libiberty/Makefile.in
parentce42130f10614d821b82412229ac4efc4c29113a (diff)
downloadgdb-acbb6e75646c3ba257fd6638ee6b4d58b7450f60.tar.gz
* Makefile.in (MULTIOSDIR): New macro. Use $(CC) $(LIBCFLAGS)
instead of $$CC alone. (install_to_tooldir): Use it.
Diffstat (limited to 'libiberty/Makefile.in')
-rw-r--r--libiberty/Makefile.in13
1 files changed, 9 insertions, 4 deletions
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 064179669bd..737d239450a 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