From ec2eb8fb014669cb53716c3aff3986528ac0e3a7 Mon Sep 17 00:00:00 2001 From: ktietz Date: Fri, 30 Oct 2009 16:47:40 +0000 Subject: [PATCH] 2009-10-30 Kai Tietz * configure.ac: Disable target-winsup & co for x86_64-*-mingw* and *-w64-mingw* targets. * configure: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153761 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 6 ++++++ configure | 8 ++++++-- configure.ac | 8 ++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c9bcf6..02367b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-10-30 Kai Tietz + + * configure.ac: Disable target-winsup & co for + x86_64-*-mingw* and *-w64-mingw* targets. + * configure: Regenerated. + 2009-10-16 Nick Clifton * MAINTAINERS: Add myself as a maintainer for the RX port. diff --git a/configure b/configure index 4af7b47..7b068a1 100755 --- a/configure +++ b/configure @@ -3509,12 +3509,14 @@ case "${target}" in # if the --with-newlib option has been given, because otherwise # 'target-newlib' will appear in skipdirs. ;; - i[3456789]86-*-mingw32*) + i[3456789]86-w64-mingw*) + noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + ;; + i[3456789]86-*-mingw*) target_configdirs="$target_configdirs target-winsup" noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" ;; x86_64-*-mingw*) - target_configdirs="$target_configdirs target-winsup" noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" ;; *-*-cygwin*) @@ -7859,6 +7861,8 @@ case " $target_configdirs " in ;; esac case "$target" in +x86_64-*-mingw* | *-w64-mingw*) + ;; *-mingw*) # Can't be handled as Cygwin above since Mingw does not use newlib. FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include' ;; diff --git a/configure.ac b/configure.ac index 7fdf357..36774a4 100644 --- a/configure.ac +++ b/configure.ac @@ -741,12 +741,14 @@ case "${target}" in # if the --with-newlib option has been given, because otherwise # 'target-newlib' will appear in skipdirs. ;; - i[[3456789]]86-*-mingw32*) + i[[3456789]]86-w64-mingw*) + noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + ;; + i[[3456789]]86-*-mingw*) target_configdirs="$target_configdirs target-winsup" noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" ;; x86_64-*-mingw*) - target_configdirs="$target_configdirs target-winsup" noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" ;; *-*-cygwin*) @@ -3015,6 +3017,8 @@ case " $target_configdirs " in ;; esac case "$target" in +x86_64-*-mingw* | *-w64-mingw*) + ;; *-mingw*) # Can't be handled as Cygwin above since Mingw does not use newlib. FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include' ;; -- 2.7.4