diff options
| author | Yaakov Selkowitz <yselkowi@redhat.com> | 2016-02-13 01:02:13 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-02-13 17:59:55 +0300 |
| commit | ef64aa4940e1d9120875a74f37b8419680f535e3 (patch) | |
| tree | c5aa00968caf7cccf2b105b1efa92bf94e8dd498 | |
| parent | 919137b3d8a11c74b05fde9a33cb9f2e6eed461e (diff) | |
cygwin: work around GCC 5 preprocessor changes
GCC 5 adds #line directives (and hence extra newlines) for macros
expansions, which confuses cygmagic. Using the -P flag avoids
them entirely.
https://cygwin.com/ml/cygwin-patches/2016-q1/msg00016.html
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
| -rwxr-xr-x | winsup/cygwin/cygmagic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/cygmagic b/winsup/cygwin/cygmagic index b94529109..036c79c11 100755 --- a/winsup/cygwin/cygmagic +++ b/winsup/cygwin/cygmagic @@ -24,7 +24,7 @@ sumit() { while [ -n "$1" ]; do define=$1; shift struct=$1; shift - sum=`$gcc -D__CYGMAGIC__ -E $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | sumit | awk '{printf "0x%xU", $1}'` + sum=`$gcc -D__CYGMAGIC__ -E -P $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ ]//g' -e '/^$/d' | sumit | awk '{printf "0x%xU", $1}'` echo "#define $define $sum" curr=`sed -n "s/^#[ ]*define CURR_$define[ ][ ]*\([^ ][^ ]*\)/\1/p" $file` [ "$curr" != "$sum" ] && echo "*** WARNING WARNING WARNING WARNING WARNING *** |