https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a7cb126b147883510911bcda28f557351f70b45d
commit a7cb126b147883510911bcda28f557351f70b45d Author: Jon Turney <[email protected]> Date: Wed Oct 28 17:02:40 2020 +0000 Cygwin: Always configure in testsuite subdirectory Doing this properly using AC_CONFIG_SUBDIRS is necessary to get the correct paths in flags given to the compiler specified in CC/CXX. Diff: --- winsup/Makefile.in | 16 +--------------- winsup/configure | 4 ++-- winsup/configure.ac | 2 +- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/winsup/Makefile.in b/winsup/Makefile.in index f1c1ce771..ba6ed092c 100644 --- a/winsup/Makefile.in +++ b/winsup/Makefile.in @@ -94,22 +94,8 @@ Makefile: Makefile.in $(srcdir)/configure config.status config.status: configure $(SHELL) config.status --recheck -# The below rule is intended to run configure only when "make check" is -# actually specified, i.e., not in a cross-compilation environment. The -# cygwin configuration is copied and modified to ensure that the same configuration -# parameters are passed when the testsuite is configured as when cygwin was configured. check: cygwin - @if [ -f testsuite/config.status ]; then \ - cd testsuite; \ - else \ - (mkdir testsuite 2>/dev/null || exit 0); \ - cd testsuite; \ - sed -e 's%winsup/cygwin\>%winsup/testsuite%g' ../cygwin/config.status > config.status; \ - chmod a+x config.status; \ - sh ./config.status --recheck; \ - sh ./config.status; \ - fi; \ - $(MAKE) check + $(MAKE) -C testsuite check utils: cygwin diff --git a/winsup/configure b/winsup/configure index e028e2889..34afe8fd4 100755 --- a/winsup/configure +++ b/winsup/configure @@ -674,7 +674,7 @@ CXX CXXFLAGS CCC CPP' -ac_subdirs_all='cygwin cygserver doc +ac_subdirs_all='cygwin cygserver doc testsuite utils' # Initialize some variables set by options. @@ -3393,7 +3393,7 @@ done -subdirs="$subdirs cygwin cygserver doc" +subdirs="$subdirs cygwin cygserver doc testsuite" if test "x$with_cross_bootstrap" != "xyes"; then subdirs="$subdirs utils" diff --git a/winsup/configure.ac b/winsup/configure.ac index 65369ae7f..5b420396d 100644 --- a/winsup/configure.ac +++ b/winsup/configure.ac @@ -29,7 +29,7 @@ AC_LANG(C++) AC_CYGWIN_INCLUDES -AC_CONFIG_SUBDIRS(cygwin cygserver doc) +AC_CONFIG_SUBDIRS(cygwin cygserver doc testsuite) if test "x$with_cross_bootstrap" != "xyes"; then AC_CONFIG_SUBDIRS([utils]) fi
