Kaydet (Commit) 7062b4e0 authored tarafından Matúš Kukan's avatar Matúš Kukan

configure: clean unused _FOR_BUILD variables

Change-Id: Ie236bbe4122fa5686a8d4c6050b5e14f354a5bb3
üst 6cab11aa
...@@ -66,14 +66,11 @@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@ ...@@ -66,14 +66,11 @@ export COMMONS_LOGGING_JAR=@COMMONS_LOGGING_JAR@
export COMPATH=@COMPATH@ export COMPATH=@COMPATH@
export COMPILER_PLUGINS=@COMPILER_PLUGINS@ export COMPILER_PLUGINS=@COMPILER_PLUGINS@
export COMP_ENV=@OUTPATH@ export COMP_ENV=@OUTPATH@
export COM_FOR_BUILD=@COM_FOR_BUILD@
export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPU=@CPU@ export CPU=@CPU@
export CPUNAME=@CPUNAME@ export CPUNAME=@CPUNAME@
export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@ export CROSS_COMPILING=@CROSS_COMPILING@
export CURL=@CURL@ export CURL=@CURL@
export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
...@@ -212,7 +209,6 @@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@ ...@@ -212,7 +209,6 @@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@
export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@
export GUI=@GUI@ export GUI=@GUI@
export GUIBASE=@GUIBASE@ export GUIBASE=@GUIBASE@
export GUI_FOR_BUILD=@GUI_FOR_BUILD@
export HARDLINKDELIVER=@HARDLINKDELIVER@ export HARDLINKDELIVER=@HARDLINKDELIVER@
export HAVE_CXX0X=@HAVE_CXX0X@ export HAVE_CXX0X=@HAVE_CXX0X@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@
...@@ -317,7 +313,6 @@ export LINK_X64_BINARY=@LINK_X64_BINARY@ ...@@ -317,7 +313,6 @@ export LINK_X64_BINARY=@LINK_X64_BINARY@
export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@ export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@ export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@ export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@
export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@
export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@
...@@ -439,7 +434,6 @@ export OS_FOR_BUILD=@OS_FOR_BUILD@ ...@@ -439,7 +434,6 @@ export OS_FOR_BUILD=@OS_FOR_BUILD@
export OUTDIR=@OUTDIR@ export OUTDIR=@OUTDIR@
export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@ export OUTDIR_FOR_BUILD=@OUTDIR_FOR_BUILD@
export OUTPATH=@OUTPATH@ export OUTPATH=@OUTPATH@
export OUTPATH_FOR_BUILD=@OUTPATH_FOR_BUILD@
export PATH=@LO_PATH@ export PATH=@LO_PATH@
export PATH_SEPERATOR=@P_SEP@ export PATH_SEPERATOR=@P_SEP@
export PERL=@PERL@ export PERL=@PERL@
......
...@@ -4065,10 +4065,9 @@ if test "$cross_compiling" = "yes"; then ...@@ -4065,10 +4065,9 @@ if test "$cross_compiling" = "yes"; then
cp config.log ../config.Build.log cp config.log ../config.Build.log
mkdir -p ../config_build mkdir -p ../config_build
cp config_host/*.h ../config_build cp config_host/*.h ../config_build
. ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH SYSTEM_LIBXSLT OUTDIR WORKDIR . ./bin/get_config_variables OS PATH CC CXX INPATH SYSTEM_LIBXSLT OUTDIR WORKDIR
for V in COM GUI OS CPU CPUNAME CC CXX MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ for V in OS CC CXX INPATH SYSTEM_LIBXSLT; do
SYSTEM_LIBXSLT; do
VV='$'$V VV='$'$V
VV=`eval "echo $VV"` VV=`eval "echo $VV"`
if test -n "$VV"; then if test -n "$VV"; then
...@@ -4098,32 +4097,17 @@ if test "$cross_compiling" = "yes"; then ...@@ -4098,32 +4097,17 @@ if test "$cross_compiling" = "yes"; then
AC_MSG_RESULT([checking for BUILD platform configuration... done]) AC_MSG_RESULT([checking for BUILD platform configuration... done])
rm -rf CONF-FOR-BUILD rm -rf CONF-FOR-BUILD
else else
OS_FOR_BUILD="$OS"
CC_FOR_BUILD="$CC" CC_FOR_BUILD="$CC"
CXX_FOR_BUILD="$CXX" CXX_FOR_BUILD="$CXX"
CC_FOR_BUILD="$CC"
COM_FOR_BUILD="$COM"
CPUNAME_FOR_BUILD="$CPUNAME"
CPU_FOR_BUILD="$CPU"
CXX_FOR_BUILD="$CXX"
GUI_FOR_BUILD="$GUI"
INPATH_FOR_BUILD="$INPATH" INPATH_FOR_BUILD="$INPATH"
MACOSX_DEPLOYMENT_TARGET_FOR_BUILD="$MACOSX_DEPLOYMENT_TARGET"
OS_FOR_BUILD="$OS"
OUTDIR_FOR_BUILD="$OUTDIR" OUTDIR_FOR_BUILD="$OUTDIR"
OUTPATH_FOR_BUILD="$OUTPATH"
WORKDIR_FOR_BUILD="$WORKDIR" WORKDIR_FOR_BUILD="$WORKDIR"
fi fi
AC_SUBST(COM_FOR_BUILD)
AC_SUBST(GUI_FOR_BUILD)
AC_SUBST(OS_FOR_BUILD) AC_SUBST(OS_FOR_BUILD)
AC_SUBST(CPU_FOR_BUILD)
AC_SUBST(CPUNAME_FOR_BUILD)
AC_SUBST(CC_FOR_BUILD) AC_SUBST(CC_FOR_BUILD)
AC_SUBST(CXX_FOR_BUILD) AC_SUBST(CXX_FOR_BUILD)
AC_SUBST(INPATH_FOR_BUILD) AC_SUBST(INPATH_FOR_BUILD)
AC_SUBST(OUTPATH_FOR_BUILD)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET_FOR_BUILD)
AC_SUBST(OUTDIR_FOR_BUILD) AC_SUBST(OUTDIR_FOR_BUILD)
AC_SUBST(WORKDIR_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment