diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2020-10-28 19:11:02 +0000 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2020-11-08 14:41:08 +0000 |
| commit | 20b5e6375c38671dbc45224b94a8c384fc81419c (patch) | |
| tree | d0cd15974cd8b175cdda95547edeaa21366bdc41 | |
| parent | 551df57fa0b967b3b99ac904dfa5089cd315bd1a (diff) | |
| download | cygnal-20b5e6375c38671dbc45224b94a8c384fc81419c.tar.gz cygnal-20b5e6375c38671dbc45224b94a8c384fc81419c.tar.bz2 cygnal-20b5e6375c38671dbc45224b94a8c384fc81419c.zip | |
Cygwin: Define target_builddir autoconf and Makefile variables
This is now required as cygwin_build is defined in terms of
target_builddir.
(Note that in other subdirectories, the autoconf variable
target_builddir is AC_SUBST-ed as a side-effect of using a macro from
winsup/acinclude.m4, which is perhaps less than ideal)
| -rw-r--r-- | winsup/testsuite/Makefile.in | 1 | ||||
| -rwxr-xr-x | winsup/testsuite/configure | 5 | ||||
| -rwxr-xr-x | winsup/testsuite/configure.ac | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in index aaa5851b2..2a44fec07 100644 --- a/winsup/testsuite/Makefile.in +++ b/winsup/testsuite/Makefile.in @@ -12,6 +12,7 @@ SHELL:=@SHELL@ srcdir:=@srcdir@ objdir:=. libltp_srcdir=$(srcdir)/libltp +target_builddir:=@target_builddir@ target_alias:=@target_alias@ build_alias:=@build_alias@ diff --git a/winsup/testsuite/configure b/winsup/testsuite/configure index da4616582..eab9fbbc7 100755 --- a/winsup/testsuite/configure +++ b/winsup/testsuite/configure @@ -587,6 +587,7 @@ PACKAGE_URL='https://cygwin.com' ac_unique_file="Makefile.in" ac_subst_vars='LTLIBOBJS LIBOBJS +target_builddir AR CPP OBJEXT @@ -1771,6 +1772,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +. ${srcdir}/../configure.cygwin + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2790,6 +2793,8 @@ else fi + + ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/winsup/testsuite/configure.ac b/winsup/testsuite/configure.ac index 46f9fb092..effea48c9 100755 --- a/winsup/testsuite/configure.ac +++ b/winsup/testsuite/configure.ac @@ -12,8 +12,12 @@ AC_PREREQ(2.59) AC_INIT([Cygwin Testsuite],[0],[cygwin@cygwin.com],[cygwin],[https://cygwin.com]) AC_CONFIG_SRCDIR(Makefile.in) +. ${srcdir}/../configure.cygwin + AC_PROG_CC AC_PROG_CPP AC_CHECK_TOOL(AR,ar) +AC_SUBST(target_builddir) + AC_OUTPUT(Makefile) |