From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id B40BC385481D; Sun, 8 Nov 2020 15:21:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B40BC385481D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jon TURNEY To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Define target_builddir autoconf and Makefile variables X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: 551df57fa0b967b3b99ac904dfa5089cd315bd1a X-Git-Newrev: 20b5e6375c38671dbc45224b94a8c384fc81419c Message-Id: <20201108152128.B40BC385481D@sourceware.org> Date: Sun, 8 Nov 2020 15:21:28 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2020 15:21:28 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=20b5e6375c38671dbc45224b94a8c384fc81419c commit 20b5e6375c38671dbc45224b94a8c384fc81419c Author: Jon Turney Date: Wed Oct 28 19:11:02 2020 +0000 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) Diff: --- winsup/testsuite/Makefile.in | 1 + winsup/testsuite/configure | 5 +++++ winsup/testsuite/configure.ac | 4 ++++ 3 files changed, 10 insertions(+) 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)