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.
This commit is contained in:
parent
58ca21cf78
commit
a7cb126b14
|
@ -94,22 +94,8 @@ Makefile: Makefile.in $(srcdir)/configure config.status
|
||||||
config.status: configure
|
config.status: configure
|
||||||
$(SHELL) config.status --recheck
|
$(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
|
check: cygwin
|
||||||
@if [ -f testsuite/config.status ]; then \
|
$(MAKE) -C testsuite check
|
||||||
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
|
|
||||||
|
|
||||||
utils: cygwin
|
utils: cygwin
|
||||||
|
|
||||||
|
|
|
@ -674,7 +674,7 @@ CXX
|
||||||
CXXFLAGS
|
CXXFLAGS
|
||||||
CCC
|
CCC
|
||||||
CPP'
|
CPP'
|
||||||
ac_subdirs_all='cygwin cygserver doc
|
ac_subdirs_all='cygwin cygserver doc testsuite
|
||||||
utils'
|
utils'
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# 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
|
if test "x$with_cross_bootstrap" != "xyes"; then
|
||||||
subdirs="$subdirs utils"
|
subdirs="$subdirs utils"
|
||||||
|
|
|
@ -29,7 +29,7 @@ AC_LANG(C++)
|
||||||
|
|
||||||
AC_CYGWIN_INCLUDES
|
AC_CYGWIN_INCLUDES
|
||||||
|
|
||||||
AC_CONFIG_SUBDIRS(cygwin cygserver doc)
|
AC_CONFIG_SUBDIRS(cygwin cygserver doc testsuite)
|
||||||
if test "x$with_cross_bootstrap" != "xyes"; then
|
if test "x$with_cross_bootstrap" != "xyes"; then
|
||||||
AC_CONFIG_SUBDIRS([utils])
|
AC_CONFIG_SUBDIRS([utils])
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue