[patch]: Decouple cygwin building from in-tree mingw/w32api building

Christopher Faylor cgf-use-the-mailinglist-please@cygwin.com
Wed Oct 17 16:44:00 GMT 2012


On Wed, Oct 17, 2012 at 06:13:18PM +0200, Kai Tietz wrote:
>Hello everybody,

I have no objections whatsoever to these changes in principle but I
would rather wait until after the 1.7.17 release for their checkin.

Other comments below.

>Index: winsup/utils/mingw
>===================================================================
>RCS file: /cvs/src/src/winsup/utils/mingw,v
>retrieving revision 1.8
>diff -p -u -3 -r1.8 mingw
>--- winsup/utils/mingw	14 Jun 2011 15:04:04 -0000	1.8
>+++ winsup/utils/mingw	17 Oct 2012 15:21:33 -0000
>@@ -5,17 +5,82 @@
> #
> # Find the path to the compiler.
> #
>+cpu=$1; shift
> compiler=$1; shift
> dir=$(cd $(dirname $("$compiler" -print-prog-name=ld))/../..; pwd)
>
> #
>+# Find the tool's name without the target-prefix
>+#
>+case $compiler in

>+*-*-*-*)

Your formatting does not match the rest of the file here ^.

>+tool=`echo "$compiler" | sed 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\(.*\)$/\4/'` ;;
>+*) tool=compiler ;;
>+esac
>+
>+#
> # The mingw32 directory should live somewhere close by to the
> # compiler.  Search for it.
> #
>-[ "$dir" = '/' ] && dir=''
>+[ "$dir" = '/' ] && dir='';

No need for a semicolon here.

I have other comments but I wonder if it would just be best to scrap this
script and assume that there is a mingw compiler installed.  When I first
wrote this script there was no mingw compiler in the distro.  Now there
is.  So I think we should just make that a requirement for building.

Then, no more head standing is required.

>Index: winsup/Makefile.common
>===================================================================
>RCS file: /cvs/src/src/winsup/Makefile.common,v
>retrieving revision 1.59
>diff -p -u -3 -r1.59 Makefile.common
>--- winsup/Makefile.common	30 Jul 2012 04:43:21 -0000	1.59
>+++ winsup/Makefile.common	17 Oct 2012 15:21:32 -0000

Can we just get rid of this as well?  That's what I did in my now-unneeded
revamp of the configury in the cygwin git repository.

I think I'd rather just move everything into winsup, cygserver, utils and
not bother with this "common" stuff.

>Index: winsup/utils/mingw
>===================================================================
>RCS file: /cvs/src/src/winsup/utils/mingw,v
>retrieving revision 1.8
>diff -p -u -3 -r1.8 mingw
>--- winsup/utils/mingw	14 Jun 2011 15:04:04 -0000	1.8
>+++ winsup/utils/mingw	17 Oct 2012 15:21:33 -0000

Looks like you included some stuff twice?

cgf



More information about the Cygwin-patches mailing list