[PATCH v2 1/2] build: Preserve *_FOR_BUILD environment variables in all cases.

They were preserved in the `"${build}" != "${host}"` case, but not in the
`"${build}" = "${host}"` case.

Each of the following commands produces the same build directory with and
without the patch:

./configure --build=x86_64-make_autoconf_enable_cross_compiling-linux-gnu --host=x86_64-linux-gnu
CC_FOR_BUILD=/tmp/gcc_for_build ./configure --build=x86_64-make_autoconf_enable_cross_compiling-linux-gnu --host=x86_64-linux-gnu
./configure

The following command produces a Makefile containing `CC_FOR_BUILD = $(CC)`
without the patch and containing `CC_FOR_BUILD = /tmp/gcc_for_build` with the
patch:

CC_FOR_BUILD=/tmp/gcc_for_build ./configure

ChangeLog:

	* configure.ac: Preserve *_FOR_BUILD environment variables in all cases.
	* configure: Regenerate.

Signed-off-by: Manuel Jacob <me@manueljacob.de>
This commit is contained in:
Manuel Jacob
2026-05-01 11:29:11 -06:00
committed by Jeff Law
parent b4edbe6ff3
commit 7beb7a55a1
2 changed files with 32 additions and 32 deletions

32
configure vendored
View File

@@ -4333,22 +4333,22 @@ if test "${build}" != "${host}" ; then
WINDRES_FOR_BUILD=${WINDRES_FOR_BUILD-windres}
WINDMC_FOR_BUILD=${WINDMC_FOR_BUILD-windmc}
else
AR_FOR_BUILD="\$(AR)"
AS_FOR_BUILD="\$(AS)"
CC_FOR_BUILD="\$(CC)"
CXX_FOR_BUILD="\$(CXX)"
DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
DSYMUTIL_FOR_BUILD="\$(DSYMUTIL)"
GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
A68_FOR_BUILD="\$(A68)"
GOC_FOR_BUILD="\$(GOC)"
GDC_FOR_BUILD="\$(GDC)"
GNATMAKE_FOR_BUILD="\$(GNATMAKE)"
LD_FOR_BUILD="\$(LD)"
NM_FOR_BUILD="\$(NM)"
RANLIB_FOR_BUILD="\$(RANLIB)"
WINDRES_FOR_BUILD="\$(WINDRES)"
WINDMC_FOR_BUILD="\$(WINDMC)"
AR_FOR_BUILD="${AR_FOR_BUILD-\$(AR)}"
AS_FOR_BUILD="${AS_FOR_BUILD-\$(AS)}"
CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
CXX_FOR_BUILD="${CXX_FOR_BUILD-\$(CXX)}"
DLLTOOL_FOR_BUILD="${DLLTOOL_FOR_BUILD-\$(DLLTOOL)}"
DSYMUTIL_FOR_BUILD="${DSYMUTIL_FOR_BUILD-\$(DSYMUTIL)}"
GFORTRAN_FOR_BUILD="${GFORTRAN_FOR_BUILD-\$(GFORTRAN)}"
A68_FOR_BUILD="${A68_FOR_BUILD-\$(A68)}"
GOC_FOR_BUILD="${GOC_FOR_BUILD-\$(GOC)}"
GDC_FOR_BUILD="${GDC_FOR_BUILD-\$(GDC)}"
GNATMAKE_FOR_BUILD="${GNATMAKE_FOR_BUILD-\$(GNATMAKE)}"
LD_FOR_BUILD="${LD_FOR_BUILD-\$(LD)}"
NM_FOR_BUILD="${NM_FOR_BUILD-\$(NM)}"
RANLIB_FOR_BUILD="${RANLIB_FOR_BUILD-\$(RANLIB)}"
WINDRES_FOR_BUILD="${WINDRES_FOR_BUILD-\$(WINDRES)}"
WINDMC_FOR_BUILD="${WINDMC_FOR_BUILD-\$(WINDMC)}"
fi
ac_ext=c

View File

@@ -1468,22 +1468,22 @@ if test "${build}" != "${host}" ; then
WINDRES_FOR_BUILD=${WINDRES_FOR_BUILD-windres}
WINDMC_FOR_BUILD=${WINDMC_FOR_BUILD-windmc}
else
AR_FOR_BUILD="\$(AR)"
AS_FOR_BUILD="\$(AS)"
CC_FOR_BUILD="\$(CC)"
CXX_FOR_BUILD="\$(CXX)"
DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
DSYMUTIL_FOR_BUILD="\$(DSYMUTIL)"
GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
A68_FOR_BUILD="\$(A68)"
GOC_FOR_BUILD="\$(GOC)"
GDC_FOR_BUILD="\$(GDC)"
GNATMAKE_FOR_BUILD="\$(GNATMAKE)"
LD_FOR_BUILD="\$(LD)"
NM_FOR_BUILD="\$(NM)"
RANLIB_FOR_BUILD="\$(RANLIB)"
WINDRES_FOR_BUILD="\$(WINDRES)"
WINDMC_FOR_BUILD="\$(WINDMC)"
AR_FOR_BUILD="${AR_FOR_BUILD-\$(AR)}"
AS_FOR_BUILD="${AS_FOR_BUILD-\$(AS)}"
CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
CXX_FOR_BUILD="${CXX_FOR_BUILD-\$(CXX)}"
DLLTOOL_FOR_BUILD="${DLLTOOL_FOR_BUILD-\$(DLLTOOL)}"
DSYMUTIL_FOR_BUILD="${DSYMUTIL_FOR_BUILD-\$(DSYMUTIL)}"
GFORTRAN_FOR_BUILD="${GFORTRAN_FOR_BUILD-\$(GFORTRAN)}"
A68_FOR_BUILD="${A68_FOR_BUILD-\$(A68)}"
GOC_FOR_BUILD="${GOC_FOR_BUILD-\$(GOC)}"
GDC_FOR_BUILD="${GDC_FOR_BUILD-\$(GDC)}"
GNATMAKE_FOR_BUILD="${GNATMAKE_FOR_BUILD-\$(GNATMAKE)}"
LD_FOR_BUILD="${LD_FOR_BUILD-\$(LD)}"
NM_FOR_BUILD="${NM_FOR_BUILD-\$(NM)}"
RANLIB_FOR_BUILD="${RANLIB_FOR_BUILD-\$(RANLIB)}"
WINDRES_FOR_BUILD="${WINDRES_FOR_BUILD-\$(WINDRES)}"
WINDMC_FOR_BUILD="${WINDMC_FOR_BUILD-\$(WINDMC)}"
fi
AC_PROG_CC_C99