From f4bfaddb3cce6b63a57c709dd790bd78c9bcdc6a Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 26 Oct 2020 13:56:51 +0000 Subject: [PATCH] Cygwin: Drop autoconf variable all_host The autoconf variable all_host is used to make building of the stub library used by the testsuite conditional on not cross-compiling. Make it unconditional, so we will notice if it's broken when cross-compiling. --- winsup/cygserver/configure | 12 ------------ winsup/cygserver/configure.ac | 11 ----------- winsup/cygwin/Makefile.in | 10 ++-------- winsup/cygwin/configure | 12 ------------ winsup/cygwin/configure.ac | 11 ----------- 5 files changed, 2 insertions(+), 54 deletions(-) diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure index aa87be83d..9f5cb8d89 100755 --- a/winsup/cygserver/configure +++ b/winsup/cygserver/configure @@ -596,7 +596,6 @@ LD RANLIB AS AR -all_host INCLUDES CPP ac_ct_CXX @@ -3387,17 +3386,6 @@ done -case "$with_cross_host" in - ""|*cygwin*) - all_host="all_host" - ;; - *) - all_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 4ff784e47..e1b29debf 100644 --- a/winsup/cygserver/configure.ac +++ b/winsup/cygserver/configure.ac @@ -27,17 +27,6 @@ AC_LANG(C++) AC_CYGWIN_INCLUDES -case "$with_cross_host" in - ""|*cygwin*) - all_host="all_host" - ;; - *) - all_host= - ;; -esac - -AC_SUBST(all_host) - AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(AS, as, as) AC_CHECK_TOOL(RANLIB, ranlib, ranlib) diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 89e1b7567..9b07d9833 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -572,17 +572,11 @@ exec_CFLAGS:=-fno-builtin-execve 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 all_host \ +.PHONY: all force dll_ofiles install \ install install-libs install-headers \ clean distclean realclean maintainer-clean -all_host=@all_host@ - -all: all_target $(all_host) - -all_target: $(TARGET_LIBS) - -all_host: $(TEST_LIB_NAME) +all: $(TARGET_LIBS) $(TEST_LIB_NAME) force: diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure index 1151d22ef..99be83c60 100755 --- a/winsup/cygwin/configure +++ b/winsup/cygwin/configure @@ -603,7 +603,6 @@ LD DLLTOOL AS AR -all_host INCLUDES CPP ac_ct_CXX @@ -3397,17 +3396,6 @@ done -case "$with_cross_host" in - ""|*cygwin*) - all_host="all_host" - ;; - *) - all_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 658247099..cf9bbaba1 100644 --- a/winsup/cygwin/configure.ac +++ b/winsup/cygwin/configure.ac @@ -29,17 +29,6 @@ AC_LANG(C++) AC_CYGWIN_INCLUDES -case "$with_cross_host" in - ""|*cygwin*) - all_host="all_host" - ;; - *) - all_host= - ;; -esac - -AC_SUBST(all_host) - AC_CHECK_TOOL(AR, ar, ar) AC_CHECK_TOOL(AS, as, as) AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)