diff options
| -rw-r--r-- | winsup/cygwin/Makefile.in | 4 | ||||
| -rwxr-xr-x | winsup/cygwin/configure | 4 | ||||
| -rw-r--r-- | 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) |