drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Makefile.in, configure.in, mkvers.sh: Revert accidental checkin from 

2012-07-06.
This commit is contained in:
Corinna Vinschen 2012-07-09 09:00:56 +00:00
parent a9cd97c8e2
commit c416f16d44
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -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.

3
winsup/cygwin/Makefile.in
View File

@ -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@

4
winsup/cygwin/configure.in
View File

@ -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

7
winsup/cygwin/mkvers.sh
View File

@ -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