Merge pull request #429 from yousong/m4subst

build: fix subst toolexecdir, toolexeclibdir
This commit is contained in:
Tom Tromey
2018-04-27 10:48:51 -06:00
committed by GitHub

View File

@@ -353,11 +353,11 @@ AC_ARG_ENABLE(multi-os-directory,
if test "x$GCC" = "xyes"; then
if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then
toolexecdir="${exec_prefix}"/'$(target_alias)'
toolexeclibdir="${toolexecdir}"/lib
toolexecdir='${exec_prefix}'/'$(target_alias)'
toolexeclibdir='${toolexecdir}'/lib
else
toolexecdir="${libdir}"/gcc-lib/'$(target_alias)'
toolexeclibdir="${libdir}"
toolexecdir='${libdir}'/gcc-lib/'$(target_alias)'
toolexeclibdir='${libdir}'
fi
if test x"$enable_multi_os_directory" != x"no"; then
multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
@@ -368,7 +368,7 @@ if test "x$GCC" = "xyes"; then
fi
AC_SUBST(toolexecdir)
else
toolexeclibdir="${libdir}"
toolexeclibdir='${libdir}'
fi
AC_SUBST(toolexeclibdir)