Patchwork [toplevel] Simplify FLAGS_FOR_TARGET for Cygwin

login
register
mail settings
Submitter Corinna Vinschen
Date Oct. 24, 2012, 1:42 p.m.
Message ID <20121024134255.GC31527@calimero.vinschen.de>
Download mbox | patch
Permalink /patch/193782/
State New
Headers show

Comments

Corinna Vinschen - Oct. 24, 2012, 1:42 p.m.
Hi guys,

I just applied the below patch to the sourceware src repo.  The reason
for the patch is that Cygwin won't be using the in-tree mingw and w32api
any longer, but instead it requires an external installation of a
Mingw64 based w32api, and a Mingw64 build environment to build the
native Windows utilities.  Additionally the FLAGS_FOR_TARGET contains
one dir which doesn't contain any libs (winsup) and one dir which doesn't
exist (winsup/include).  The below patch only changes FLAGS_FOR_TARGET
accordingly.

Could somebody with toplevel checkin rights in the gcc repo please apply
this patch there, too?


Thanks,
Corinna


2012-10-24  Corinna Vinschen  <corinna AT vinschen DOT de>

	* configure.ac (FLAGS_FOR_TARGET,target=cygwin): Fix for building
	against Mingw64 w32api.
	* configure: Regenerate.

Patch

Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.176
diff -u -p -r1.176 configure.ac
--- configure.ac	23 Oct 2012 23:02:33 -0000	1.176
+++ configure.ac	24 Oct 2012 13:39:56 -0000
@@ -2827,7 +2827,7 @@  case " $target_configdirs " in
   *" --with-newlib "*)
    case "$target" in
     *-cygwin*)
-      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include'
+      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include'
       ;;
    esac
 
Index: configure
===================================================================
RCS file: /cvs/src/src/configure,v
retrieving revision 1.432
diff -u -p -r1.432 configure
--- configure	23 Oct 2012 23:02:33 -0000	1.432
+++ configure	24 Oct 2012 13:39:55 -0000
@@ -7301,7 +7301,7 @@  case " $target_configdirs " in
   *" --with-newlib "*)
    case "$target" in
     *-cygwin*)
-      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include'
+      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include'
       ;;
    esac