diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 18:44:13 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-07-06 18:44:13 +0400 |
| commit | 3eedbf86113bf48d7e11349439b91fb034f5d1cd (patch) | |
| tree | b41a5873c0f8a71d653c4be010c3c7cc52990287 /winsup/cygwin/mkvers.sh | |
| parent | e75fa972ac783e0b87bcdfd625fe4f199bafd8ee (diff) | |
* winlean.h (__STRALIGN_H_): Drop definition.
Diffstat (limited to 'winsup/cygwin/mkvers.sh')
| -rwxr-xr-x | winsup/cygwin/mkvers.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/mkvers.sh index aa3903bb2..18ba3b64a 100755 --- a/winsup/cygwin/mkvers.sh +++ b/winsup/cygwin/mkvers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # mkvers.sh - Make version information for cygwin DLL # # Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2010 Red Hat, Inc. @@ -149,6 +149,9 @@ 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 $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 +$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 |