This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Remove --disable-cpp


--disable-cpp was a configure option intended to aid with the
transition from /lib/cpp being a symlink to
$prefix/lib/gcc-lib/T/V/cpp, to /usr/bin/cpp being its own executable
and there not being any $prefix/lib/gcc-lib/T/V/cpp.  That transition
is long since accomplished, and I don't see any reason to preserve the
option and associated Makefile gunk.  This patch removes all of it; we
unconditionally install $prefix/bin/cpp.

(Note that the option to install cpp somewhere else additionally is
still available and unaffected by this patch.  That's
--with-cpp-install-dir.)

Bootstrapped and 'make install', 'make uninstall' tested on
i686-linux.  OK to apply?

zw

	* Makefile.in (INSTALL_CPP, UNINSTALL_CPP): Remove.
	(install): Refer to install-cpp directly.
	(uninstall-cpp): Folded into uninstall rule.
	* configure.in: Delete all code relating to --disable-cpp.
	* configure: Regenerate.
	* config/t-install-cpp: Delete.

===================================================================
Index: Makefile.in
--- Makefile.in	31 May 2002 20:11:39 -0000	1.883
+++ Makefile.in	31 May 2002 23:03:47 -0000
@@ -422,10 +422,6 @@ LIB2FUNCS_EXTRA =
 # Assembler files should have names ending in `.asm'.
 LIB2FUNCS_STATIC_EXTRA =
 
-# Handle cpp installation.
-INSTALL_CPP=
-UNINSTALL_CPP=
-
 # We do not try to build float.h anymore.  Let configure select the
 # appropriate pre-built float.h file for the target.
 FLOAT_H=@float_h_file@
@@ -2567,7 +2563,7 @@ maintainer-clean:
 # Install the driver last so that the window when things are
 # broken is small.
 install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
-    $(INSTALL_CPP) install-man install-info intl.install install-@POSUB@ \
+    install-cpp install-man install-info intl.install install-@POSUB@ \
     lang.install-normal install-driver
 
 # Handle cpp installation.
@@ -2588,14 +2584,6 @@ install-cpp: cpp$(exeext)
 	  else true; fi; \
 	fi
 
-uninstall-cpp:
-	-rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext)
-	-rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext)
-	-if [ x$(cpp_install_dir) != x ]; then \
-	  rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
-	  rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
-	else true; fi
-
 # Create the installation directories.
 installdirs:
 	-if [ -d $(prefix) ] ; then true ; else mkdir $(prefix) ; chmod a+rx $(prefix) ; fi
@@ -2891,10 +2879,16 @@ install-collect2: collect2 installdirs
 	$(INSTALL_PROGRAM) xgcc$(exeext) $(libsubdir)/gcc$(exeext)
 
 # Cancel installation by deleting the installed files.
-uninstall: intl.uninstall lang.uninstall $(UNINSTALL_CPP)
+uninstall: intl.uninstall lang.uninstall
 	-rm -rf $(libsubdir)
 	-rm -rf $(bindir)/$(GCC_INSTALL_NAME)$(exeext)
 	-rm -rf $(bindir)/$(GCC_CROSS_NAME)$(exeext)
+	-rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext)
+	-rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext)
+	-if [ x$(cpp_install_dir) != x ]; then \
+	  rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
+	  rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
+	else true; fi
 	-rm -rf $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext)
 	-rm -rf $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext)
 	-rm -rf $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext)
===================================================================
Index: configure.in
--- configure.in	31 May 2002 20:11:46 -0000	1.595
+++ configure.in	31 May 2002 23:06:29 -0000
@@ -254,11 +254,6 @@ if test x$ac_gc_always_collect != x ; th
    every opportunity.  This is extremely expensive.])
 fi
 
-
-AC_ARG_ENABLE(cpp,
-[  --disable-cpp           don't provide a user-visible C preprocessor],
-[], [enable_cpp=yes])
-
 AC_ARG_WITH(cpp_install_dir,
 [  --with-cpp-install-dir=DIR
                           install the user visible C preprocessor in DIR
@@ -772,12 +767,6 @@ fi
 if test $float_format = none
 then float_h_file=Makefile.in
 else float_h_file=float-$float_format.h
-fi
-
-# Handle cpp installation.
-if test x$enable_cpp != xno
-then
-  tmake_file="$tmake_file t-install-cpp"
 fi
 
 # Say what files are being used for the output code and MD file.
===================================================================
Index: config/t-install-cpp
--- config/t-install-cpp	2 Mar 1999 00:59:35 -0000	1.2
+++ config/t-install-cpp	1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-# Handle cpp installation.
-INSTALL_CPP=install-cpp
-UNINSTALL_CPP=uninstall-cpp


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]