From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 20A793894C11; Mon, 2 Nov 2020 19:41:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20A793894C11 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jon TURNEY To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Remove autoconf variable DLL_NAME X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: d555072c94c5d705b2f78b5e2d7d4276fc4f5971 X-Git-Newrev: 29817cc41ea015074772b2cd1f290f79ff633736 Message-Id: <20201102194150.20A793894C11@sourceware.org> Date: Mon, 2 Nov 2020 19:41:50 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Nov 2020 19:41:50 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=29817cc41ea015074772b2cd1f290f79ff633736 commit 29817cc41ea015074772b2cd1f290f79ff633736 Author: Jon Turney Date: Fri Oct 23 15:33:39 2020 +0100 Cygwin: Remove autoconf variable DLL_NAME Remove autoconf variable DLL_NAME, which has a constant value which is only used in one place. Diff: --- winsup/cygwin/Makefile.in | 4 ++-- winsup/cygwin/configure | 4 ---- winsup/cygwin/configure.ac | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index cb9924b3a..89e1b7567 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -102,8 +102,8 @@ RUNTESTFLAGS = # native rebuilding issues (we don't want the build tools to see a partially # built cygwin.dll and attempt to use it instead of the old one). -DLL_NAME:=@DLL_NAME@ -TEST_DLL_NAME:=${patsubst %1.dll,%0.dll,@DLL_NAME@} +DLL_NAME:=cygwin1.dll +TEST_DLL_NAME:=${patsubst %1.dll,%0.dll,$(DLL_NAME)} TEST_LIB_NAME:=libcygwin0.a STATIC_LIB_NAME:=libcygwin_s.a DIN_FILE=@DIN_FILE@ common.din diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure index 4665aee73..1151d22ef 100755 --- a/winsup/cygwin/configure +++ b/winsup/cygwin/configure @@ -592,7 +592,6 @@ TLSOFFSETS_H DIN_FILE DEF_DLL_ENTRY DLL_ENTRY -DLL_NAME configure_args WINDRES STRIP @@ -4344,14 +4343,12 @@ fi case "$target_cpu" in i?86) - DLL_NAME="cygwin1.dll" DLL_ENTRY="_dll_entry@12" DEF_DLL_ENTRY="dll_entry@12" DIN_FILE="i686.din" TLSOFFSETS_H="tlsoffsets.h" ;; x86_64) - DLL_NAME="cygwin1.dll" DLL_ENTRY="dll_entry" DEF_DLL_ENTRY="dll_entry" DIN_FILE="x86_64.din" @@ -4375,7 +4372,6 @@ configure_args=$(/usr/bin/expr "$configure_args" : 'X \(.*\)') - ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/winsup/cygwin/configure.ac b/winsup/cygwin/configure.ac index aafc4d925..658247099 100644 --- a/winsup/cygwin/configure.ac +++ b/winsup/cygwin/configure.ac @@ -61,14 +61,12 @@ esac case "$target_cpu" in i?86) - DLL_NAME="cygwin1.dll" DLL_ENTRY="_dll_entry@12" DEF_DLL_ENTRY="dll_entry@12" DIN_FILE="i686.din" TLSOFFSETS_H="tlsoffsets.h" ;; x86_64) - DLL_NAME="cygwin1.dll" DLL_ENTRY="dll_entry" DEF_DLL_ENTRY="dll_entry" DIN_FILE="x86_64.din" @@ -78,7 +76,6 @@ case "$target_cpu" in esac AC_CONFIGURE_ARGS -AC_SUBST(DLL_NAME) AC_SUBST(DLL_ENTRY) AC_SUBST(DEF_DLL_ENTRY) AC_SUBST(DIN_FILE)