mirror of git://gcc.gnu.org/git/gcc.git
configure.ac (FLAGS_FOR_TARGET): Add -L and -isystem paths for *-w64-mingw* and x86_64-*mingw*.
2009-11-06 Ozkan Sezer <sezeroz@gmail.com> * configure.ac (FLAGS_FOR_TARGET): Add -L and -isystem paths for *-w64-mingw* and x86_64-*mingw*. * configure: Regenerated. From-SVN: r153964
This commit is contained in:
parent
d32599a6e9
commit
5d571eaa95
|
@ -1,3 +1,9 @@
|
||||||
|
2009-11-06 Ozkan Sezer <sezeroz@gmail.com>
|
||||||
|
|
||||||
|
* configure.ac (FLAGS_FOR_TARGET): Add -L and -isystem
|
||||||
|
paths for *-w64-mingw* and x86_64-*mingw*.
|
||||||
|
* configure: Regenerated.
|
||||||
|
|
||||||
2009-11-05 Joern Rennecke <amylaar@spamcop.net>
|
2009-11-05 Joern Rennecke <amylaar@spamcop.net>
|
||||||
|
|
||||||
* MAINTAINERS (Write After Approval): Add entry for my INRIA work.
|
* MAINTAINERS (Write After Approval): Add entry for my INRIA work.
|
||||||
|
|
|
@ -7803,8 +7803,9 @@ case " $target_configdirs " in
|
||||||
case " $target_configargs " in
|
case " $target_configargs " in
|
||||||
*" --with-newlib "*)
|
*" --with-newlib "*)
|
||||||
case "$target" in
|
case "$target" in
|
||||||
*-cygwin*)
|
*-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 -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'
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# If we're not building GCC, don't discard standard headers.
|
# If we're not building GCC, don't discard standard headers.
|
||||||
|
@ -7860,12 +7861,17 @@ case " $target_configdirs " in
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case "$target" in
|
case "$target" in
|
||||||
x86_64-*-mingw* | *-w64-mingw*)
|
x86_64-*mingw* | *-w64-mingw*)
|
||||||
;;
|
# MinGW-w64 does not use newlib, nor does it use winsup. It may,
|
||||||
*-mingw*)
|
# however, use a symlink named 'mingw' in ${prefix} .
|
||||||
# Can't be handled as Cygwin above since Mingw does not use newlib.
|
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L${prefix}/${target}/lib -L${prefix}/mingw/lib -isystem ${prefix}/${target}/include -isystem ${prefix}/mingw/include'
|
||||||
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' ;;
|
;;
|
||||||
|
*-mingw*)
|
||||||
|
# MinGW can't be handled as Cygwin above since it 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'
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Allow the user to override the flags for
|
# Allow the user to override the flags for
|
||||||
|
|
26
configure.ac
26
configure.ac
|
@ -747,10 +747,10 @@ case "${target}" in
|
||||||
i[[3456789]]86-*-mingw*)
|
i[[3456789]]86-*-mingw*)
|
||||||
target_configdirs="$target_configdirs target-winsup"
|
target_configdirs="$target_configdirs target-winsup"
|
||||||
noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
|
noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
|
||||||
;;
|
;;
|
||||||
x86_64-*-mingw*)
|
x86_64-*-mingw*)
|
||||||
noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
|
noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
|
||||||
;;
|
;;
|
||||||
*-*-cygwin*)
|
*-*-cygwin*)
|
||||||
target_configdirs="$target_configdirs target-libtermcap target-winsup"
|
target_configdirs="$target_configdirs target-libtermcap target-winsup"
|
||||||
noconfigdirs="$noconfigdirs target-gperf target-libgloss"
|
noconfigdirs="$noconfigdirs target-gperf target-libgloss"
|
||||||
|
@ -760,7 +760,7 @@ case "${target}" in
|
||||||
elif test -d "$srcdir/newlib"; then
|
elif test -d "$srcdir/newlib"; then
|
||||||
echo "Warning: winsup/cygwin is missing so newlib can't be built."
|
echo "Warning: winsup/cygwin is missing so newlib can't be built."
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
i[[3456789]]86-moss-msdos | i[[3456789]]86-*-moss* | \
|
i[[3456789]]86-moss-msdos | i[[3456789]]86-*-moss* | \
|
||||||
i[[3456789]]86-*-uwin* | i[[3456789]]86-*-interix* )
|
i[[3456789]]86-*-uwin* | i[[3456789]]86-*-interix* )
|
||||||
;;
|
;;
|
||||||
|
@ -2959,8 +2959,9 @@ case " $target_configdirs " in
|
||||||
case " $target_configargs " in
|
case " $target_configargs " in
|
||||||
*" --with-newlib "*)
|
*" --with-newlib "*)
|
||||||
case "$target" in
|
case "$target" in
|
||||||
*-cygwin*)
|
*-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 -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'
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# If we're not building GCC, don't discard standard headers.
|
# If we're not building GCC, don't discard standard headers.
|
||||||
|
@ -3016,12 +3017,17 @@ case " $target_configdirs " in
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
case "$target" in
|
case "$target" in
|
||||||
x86_64-*-mingw* | *-w64-mingw*)
|
x86_64-*mingw* | *-w64-mingw*)
|
||||||
;;
|
# MinGW-w64 does not use newlib, nor does it use winsup. It may,
|
||||||
*-mingw*)
|
# however, use a symlink named 'mingw' in ${prefix} .
|
||||||
# Can't be handled as Cygwin above since Mingw does not use newlib.
|
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L${prefix}/${target}/lib -L${prefix}/mingw/lib -isystem ${prefix}/${target}/include -isystem ${prefix}/mingw/include'
|
||||||
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' ;;
|
;;
|
||||||
|
*-mingw*)
|
||||||
|
# MinGW can't be handled as Cygwin above since it 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'
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Allow the user to override the flags for
|
# Allow the user to override the flags for
|
||||||
|
|
Loading…
Reference in New Issue