diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2016-03-23 09:34:10 -0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-03-30 13:50:16 +0200 |
| commit | cf41355aba481fdd94195654bf15b71f41b24469 (patch) | |
| tree | acff3b34cd7e405612f1b209c6a4e8714b9aa297 /winsup/configure | |
| parent | 279aaeb5c7511cacd5496603a6dbd2901bc8e9af (diff) | |
| download | cygnal-cf41355aba481fdd94195654bf15b71f41b24469.tar.gz cygnal-cf41355aba481fdd94195654bf15b71f41b24469.tar.bz2 cygnal-cf41355aba481fdd94195654bf15b71f41b24469.zip | |
Add option to not build mingw programs when cross compiling.
Add an option to not require a mingw compiler when bootstrapping a cross toolchain.
Defaults to existing behavior.
Also update some obsolete macros.
winsup/ChangeLog
configure.ac: Add option to skip building programs that require mingw.
configure: Regenerate.
Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Diffstat (limited to 'winsup/configure')
| -rwxr-xr-x | winsup/configure | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/winsup/configure b/winsup/configure index 0887d66e3..541c81bfc 100755 --- a/winsup/configure +++ b/winsup/configure @@ -665,6 +665,7 @@ target_builddir' ac_subst_files='' ac_user_opts=' enable_option_checking +with_mingw_progs with_windows_headers with_windows_libs ' @@ -680,7 +681,8 @@ CXX CXXFLAGS CCC CPP' -ac_subdirs_all='cygwin utils cygserver lsaauth doc' +ac_subdirs_all='cygwin cygserver doc +utils lsaauth' # Initialize some variables set by options. ac_init_help= @@ -1293,6 +1295,8 @@ if test -n "$ac_init_help"; then Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --without-mingw-progs do not build programs using the mingw toolchain + (useful for cross-compiling) --with-windows-headers=DIR specify where the windows includes are located --with-windows-libs=DIR specify where the windows libraries are located @@ -2092,7 +2096,6 @@ test -n "$target_alias" && NONENONEs,x,x, && program_prefix=${target_alias}- - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3359,6 +3362,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Check whether --with-mingw-progs was given. +if test "${with_mingw_progs+set}" = set; then : + withval=$with_mingw_progs; +else + with_mingw_progs=yes +fi + + # Check whether --with-windows-headers was given. @@ -3435,7 +3446,12 @@ export CXX -subdirs="$subdirs cygwin utils cygserver lsaauth doc" +subdirs="$subdirs cygwin cygserver doc" + +if test "x$with_mingw_progs" != xno; then + subdirs="$subdirs utils lsaauth" + +fi INSTALL_LICENSE="install-license" |