diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-07-09 09:00:56 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-07-09 09:00:56 +0000 |
| commit | c416f16d4483b6e2d4684fa3200b19619a5143b7 (patch) | |
| tree | 4cae9a0a6c01fe09e8155361e1fbe3ec6170873e | |
| parent | a9cd97c8e2406ca3c07fcf543a85d21d5e10f620 (diff) | |
| download | cygnal-c416f16d4483b6e2d4684fa3200b19619a5143b7.tar.gz cygnal-c416f16d4483b6e2d4684fa3200b19619a5143b7.tar.bz2 cygnal-c416f16d4483b6e2d4684fa3200b19619a5143b7.zip | |
* Makefile.in, configure.in, mkvers.sh: Revert accidental checkin from
2012-07-06.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/Makefile.in | 3 | ||||
| -rw-r--r-- | winsup/cygwin/configure.in | 4 | ||||
| -rwxr-xr-x | winsup/cygwin/mkvers.sh | 7 |
4 files changed, 8 insertions, 11 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9cd0cb5f4..604651f53 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2012-07-08 Corinna Vinschen <corinna@vinschen.de> + + * Makefile.in, configure.in, mkvers.sh: Revert accidental checkin from + 2012-07-06. + 2012-07-07 Christopher Faylor <me.cygwin2012@cgf.cx> * Makefile.in: Change mingw_lib (temporarily?) back to w32api_lib. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index fb68c5e43..494314be8 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -17,6 +17,7 @@ CC:=@CC@ CC_FOR_TARGET:=$(CC) srcdir:=@srcdir@ CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@ +include ${srcdir}/../Makefile.common SHELL:=@SHELL@ objdir:=. @@ -28,8 +29,6 @@ build_alias:=@build_alias@ host_alias:=@host_alias@ prefix:=@prefix@ -include ${srcdir}/../Makefile.common - program_transform_name:=@program_transform_name@ exec_prefix:=@exec_prefix@ bindir:=@bindir@ diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in index bdece563b..3ac092f57 100644 --- a/winsup/cygwin/configure.in +++ b/winsup/cygwin/configure.in @@ -80,10 +80,6 @@ case "$target_cpu" in DEF_DLL_ENTRY="dll_entry@12" ALLOCA="_alloca" CONFIG_DIR="i386" ;; - x86_64) DLL_ENTRY="_dll_entry@12" - DEF_DLL_ENTRY="dll_entry@12" - ALLOCA="_alloca" - CONFIG_DIR="x86_64" ;; *) AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;; esac diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/mkvers.sh index 18ba3b64a..aa3903bb2 100755 --- a/winsup/cygwin/mkvers.sh +++ b/winsup/cygwin/mkvers.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # mkvers.sh - Make version information for cygwin DLL # # Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2010 Red Hat, Inc. @@ -149,9 +149,6 @@ if [ -n "$cvs_tag" ]; then cygwin_ver="$cygwin_ver-$cvs_tag" fi -compiler=$(echo "$windres" | sed -e 's/windres/gcc/') -cpu=$("$compiler" -dumpmachine | sed -e 's/\([^-]*\).*/\1/') - echo "Version $cygwin_ver" set -$- $builddate -$windres --include-dir /usr/$cpu-w64-mingw32/sys-root/mingw/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o +$windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o |