From c50e0d8ba492596ca4f5557eae8592b19d33f09b Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Fri, 16 Oct 2020 15:06:43 +0100 Subject: [PATCH] Cygwin: Drop do-nothing install_host target Drop do-nothing install_host target, which is only used when not cross-compiling. --- winsup/cygserver/configure | 4 ---- winsup/cygserver/configure.ac | 3 --- winsup/cygwin/Makefile.in | 7 ++----- winsup/cygwin/configure | 4 ---- winsup/cygwin/configure.ac | 3 --- winsup/testsuite/Makefile.in | 4 +--- 6 files changed, 3 insertions(+), 22 deletions(-) diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure index 4d1bb97d0..aa87be83d 100755 --- a/winsup/cygserver/configure +++ b/winsup/cygserver/configure @@ -596,7 +596,6 @@ LD RANLIB AS AR -install_host all_host INCLUDES CPP @@ -3391,17 +3390,14 @@ done case "$with_cross_host" in ""|*cygwin*) all_host="all_host" - install_host="install_host" ;; *) all_host= - install_host= ;; esac - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 diff --git a/winsup/cygserver/configure.ac b/winsup/cygserver/configure.ac index 9a6baceb7..4ff784e47 100644 --- a/winsup/cygserver/configure.ac +++ b/winsup/cygserver/configure.ac @@ -30,16 +30,13 @@ AC_CYGWIN_INCLUDES case "$with_cross_host" in ""|*cygwin*) all_host="all_host" - install_host="install_host" ;; *) all_host= - install_host= ;; esac AC_SUBST(all_host) -AC_SUBST(install_host) AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(AS, as, as) diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index a4c9c4786..4535cfc6e 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -570,11 +570,10 @@ fhandler_proc_CFLAGS+=-DUSERNAME="\"$(USER)\"" -DHOSTNAME="\"$(HOSTNAME)\"" fhandler_proc_CFLAGS+=-DGCC_VERSION="\"`$(CC) -v 2>&1 | tail -n 1`\"" .PHONY: all force dll_ofiles install all_target install_target all_host \ - install_host install install-libs install-headers \ + install install-libs install-headers \ clean distclean realclean maintainer-clean all_host=@all_host@ -install_host=@install_host@ all: all_target $(all_host) @@ -585,7 +584,7 @@ all_host: $(TEST_LIB_NAME) force: install: install-libs install-headers install-man install-ldif install_target \ - $(install_host) $(install_target) + $(install_target) uninstall: uninstall-libs uninstall-headers uninstall-man @@ -628,8 +627,6 @@ install-ldif: install_target: -install_host: - uninstall-libs: $(TARGET_LIBS) rm -f $(bindir)/$(DLL_NAME); \ for i in $^; do \ diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure index eddd8996f..4665aee73 100755 --- a/winsup/cygwin/configure +++ b/winsup/cygwin/configure @@ -604,7 +604,6 @@ LD DLLTOOL AS AR -install_host all_host INCLUDES CPP @@ -3402,17 +3401,14 @@ done case "$with_cross_host" in ""|*cygwin*) all_host="all_host" - install_host="install_host" ;; *) all_host= - install_host= ;; esac - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 diff --git a/winsup/cygwin/configure.ac b/winsup/cygwin/configure.ac index 0e9df29bb..aafc4d925 100644 --- a/winsup/cygwin/configure.ac +++ b/winsup/cygwin/configure.ac @@ -32,16 +32,13 @@ AC_CYGWIN_INCLUDES case "$with_cross_host" in ""|*cygwin*) all_host="all_host" - install_host="install_host" ;; *) all_host= - install_host= ;; esac AC_SUBST(all_host) -AC_SUBST(install_host) AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(AS, as, as) diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in index a86a35b88..050d5b164 100644 --- a/winsup/testsuite/Makefile.in +++ b/winsup/testsuite/Makefile.in @@ -82,7 +82,7 @@ override COMPILE_CC:=${filter-out -O%,$(COMPILE_CC)} override CFLAGS:=${filter-out -O%,$(CFLAGS)} export CFLAGS -.PHONY: all force dll_ofiles install all_target install_target install_host +.PHONY: all force dll_ofiles install all_target install_target .SUFFIXES: .SUFFIXES: .c .cc .def .a .o .d @@ -93,8 +93,6 @@ force: install: -install_host: - clean: -rm -f *.o *.dll *.a *.exp junk *.bak *.base *.exe testsuite/* *.d *.dat