diff options
author | Peter Foley <pefoley2@pefoley.com> | 2016-04-02 17:56:44 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2016-04-04 17:39:41 +0300 |
commit | e7e6119241d02241c3d114cff037340c12245393 (patch) | |
tree | 68488be3d8f28ddfb65d4a39c42e2f3ae10cf900 /winsup/configure.ac | |
parent | 5d3ad3b123b7c121d7a6eac27fb13016171e27bc (diff) |
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/configure.ac')
-rw-r--r-- | winsup/configure.ac | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/winsup/configure.ac b/winsup/configure.ac index b04f0444e..3daa2acac 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -25,17 +25,19 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_CPP AC_LANG(C) -AC_ARG_WITH([mingw-progs],[AS_HELP_STRING([--without-mingw-progs],[do not build programs using the mingw toolchain (useful for cross-compiling)])],[],[with_mingw_progs=yes]) +AC_ARG_WITH([cross-bootstrap],[AS_HELP_STRING([--with-cross-bootstrap],[do not build programs using the mingw toolchain or check for mingw libraries (useful for bootstrapping a cross-compiler)])],[],[with_cross_bootstrap=no]) AC_WINDOWS_HEADERS -AC_WINDOWS_LIBS +if test "x$with_cross_bootstrap" != "xyes"; then + AC_WINDOWS_LIBS +fi AC_LANG(C++) AC_CYGWIN_INCLUDES AC_CONFIG_SUBDIRS(cygwin cygserver doc) -if test "x$with_mingw_progs" != xno; then +if test "x$with_cross_bootstrap" != "xyes"; then AC_CONFIG_SUBDIRS([utils lsaauth]) fi |