diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2016-04-02 10:56:44 -0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-04-04 16:39:41 +0200 |
| commit | e7e6119241d02241c3d114cff037340c12245393 (patch) | |
| tree | 68488be3d8f28ddfb65d4a39c42e2f3ae10cf900 /winsup/cygserver | |
| parent | 5d3ad3b123b7c121d7a6eac27fb13016171e27bc (diff) | |
| download | cygnal-e7e6119241d02241c3d114cff037340c12245393.tar.gz cygnal-e7e6119241d02241c3d114cff037340c12245393.tar.bz2 cygnal-e7e6119241d02241c3d114cff037340c12245393.zip | |
Rename without-mingw-progs to with-cross-bootstrap
Rename without-mingw-progs to with-cross-bootstrap, since it now
disables additional checks that are problematic for cross-compilers.
When cross-compiling a toolchain targeting cygwin, building cygwin1.dll
requires libgcc.
However, building libgcc requires the cygwin headers to be
installed.
Configuring cygwin requries the mingw-crt libraries, which require the
cygwin headers to be installed.
Work around this circular dependency by making the
--with-cross-bootstrap configure option skip cygwin's configure checks
for valid mingw-crt libraries. Cygwin will still properly link against
these libraries if they exist, but this allows configure to succeed even
if the libraries have not been built yet.
Since the mingw-crt libraries only require the cygwin headers to be
installed, this allows us to successfully configure cygwin so that we
can only install the headers without trying to build any
libraries.
winsup/ChangeLog
configure.ac: rename without-mingw-progs option to with-cross-bootstrap
configure: regenerate
winsup/cygserver/ChangeLog
configure.ac: don't check AC_WINDOWS_LIBS when using with-cross-bootstrap
configure: regenerate
winsup/cygwin/ChangeLog
configure.ac: don't check AC_WINDOWS_LIBS when using with-cross-bootstrap
configure: regenerate
Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Diffstat (limited to 'winsup/cygserver')
| -rwxr-xr-x | winsup/cygserver/configure | 2 | ||||
| -rw-r--r-- | winsup/cygserver/configure.ac | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure index 37caf5729..71d1592f4 100755 --- a/winsup/cygserver/configure +++ b/winsup/cygserver/configure @@ -3381,6 +3381,7 @@ if test "${with_windows_headers+set}" = set; then : fi +if test "x$with_cross_bootstrap" != "xyes"; then # Check whether --with-windows-libs was given. @@ -3399,6 +3400,7 @@ fi +fi ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' diff --git a/winsup/cygserver/configure.ac b/winsup/cygserver/configure.ac index 5d1464b9d..eb6a894de 100644 --- a/winsup/cygserver/configure.ac +++ b/winsup/cygserver/configure.ac @@ -9,7 +9,7 @@ dnl details. dnl dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.59) +AC_PREREQ([2.59]) AC_INIT([Cygwin Cygserver],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com]) AC_CONFIG_SRCDIR(cygserver.cc) AC_CONFIG_AUX_DIR(..) @@ -26,7 +26,9 @@ AC_PROG_CPP AC_LANG(C) AC_WINDOWS_HEADERS -AC_WINDOWS_LIBS +if test "x$with_cross_bootstrap" != "xyes"; then + AC_WINDOWS_LIBS +fi AC_LANG(C++) @@ -65,4 +67,5 @@ esac ]) AC_CONFIGURE_ARGS -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT |