Make-lang.in (DEMANGLER_INSTALL_NAME, [...]): New macros.

* Make-lang.in (DEMANGLER_INSTALL_NAME, DEMANGLER_CROSS_NAME): New
	macros.
	(c++.install-common): Install c++filt properly as native or as cross
	variant.
	(c++.uninstall): Add c++filt.

From-SVN: r18000
This commit is contained in:
Manfred Hollstein 1998-02-14 15:56:38 +00:00 committed by Jason Merrill
parent 798eed5ebb
commit 5b47722461
2 changed files with 23 additions and 2 deletions

View File

@ -1,3 +1,11 @@
Sat Feb 14 11:50:51 1998 Manfred Hollstein <manfred@s-direktnet.de>
* Make-lang.in (DEMANGLER_INSTALL_NAME, DEMANGLER_CROSS_NAME): New
macros.
(c++.install-common): Install c++filt properly as native or as cross
variant.
(c++.uninstall): Add c++filt.
Fri Feb 13 14:55:37 1998 Jason Merrill <jason@yorick.cygnus.com>
* call.c (standard_conversion): Fix multi-level ptr conversions.

View File

@ -45,10 +45,12 @@ CXX_FLAGS_TO_PASS = \
# Actual names to use when installing a native compiler.
CXX_INSTALL_NAME = `t='$(program_transform_name)'; echo c++ | sed $$t`
GXX_INSTALL_NAME = `t='$(program_transform_name)'; echo g++ | sed $$t`
DEMANGLER_INSTALL_NAME = `t='$(program_transform_name)'; echo c++filt | sed $$t`
# Actual names to use when installing a cross-compiler.
CXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++ | sed $$t`
GXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g++ | sed $$t`
DEMANGLER_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++filt | sed $$t`
# The name to use for the demangler program.
DEMANGLER_PROG = c++filt$(exeext)
@ -225,8 +227,17 @@ c++.install-common:
rm -f $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
$(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
fi ; \
rm -f $(bindir)/$(DEMANGLER_PROG) ; \
$(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_PROG) ; \
if [ x$(DEMANGLER_PROG) != x ] && [ -x "$(DEMANGLER_PROG)" ]; then \
if [ -f g++-cross$(exeext) ] ; then \
rm -f $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \
$(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \
chmod a+x $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \
else \
rm -f $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \
$(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \
chmod a+x $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \
fi ; \
fi ; \
fi
c++.install-info:
@ -249,6 +260,8 @@ c++.uninstall:
-rm -rf $(bindir)/$(CXX_CROSS_NAME)$(exeext)
-rm -rf $(bindir)/$(GXX_INSTALL_NAME)$(exeext)
-rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext)
-rm -rf $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext)
-rm -rf $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext)
-rm -rf $(mandir)/$(GXX_INSTALL_NAME)$(manext)
-rm -rf $(mandir)/$(GXX_CROSS_NAME)$(manext)
#