diff options
| author | Manfred Hollstein <manfred@s-direktnet.de> | 1998-02-14 15:56:38 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-02-14 10:56:38 -0500 |
| commit | 5b4772246126539a05f7709fc5740096b7edd039 (patch) | |
| tree | 101b9adc5d0e02f07aece9be13602b8cc5f5d4da /gcc | |
| parent | 798eed5ebb0cf04e983c0b5dbace09523201db35 (diff) | |
| download | gcc-5b4772246126539a05f7709fc5740096b7edd039.zip gcc-5b4772246126539a05f7709fc5740096b7edd039.tar.gz gcc-5b4772246126539a05f7709fc5740096b7edd039.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bd3003f..6da997c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 2c202ce..a9e4e1c 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -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) # |