Fix wrongly applied last patch.
From-SVN: r62239
This commit is contained in:
parent
5175d1b8e8
commit
3123c967cc
2 changed files with 4 additions and 4 deletions
4
libffi/configure
vendored
4
libffi/configure
vendored
|
@ -633,7 +633,7 @@ fi
|
|||
|
||||
if test "${srcdir}" = "."; then
|
||||
if test "${with_target_subdir}" != "."; then
|
||||
libffi_basedir="${with_multisrctop}.."
|
||||
libffi_basedir="${with_multisrctop}../"
|
||||
else
|
||||
libffi_basedir="${with_multisrctop}"
|
||||
fi
|
||||
|
@ -4094,7 +4094,7 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
|
|||
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${srcdir}/${libffi_basedir}/../config-ml.in
|
||||
ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
|
|
@ -22,7 +22,7 @@ dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
|
|||
|
||||
if test "${srcdir}" = "."; then
|
||||
if test "${with_target_subdir}" != "."; then
|
||||
libffi_basedir="${with_multisrctop}.."
|
||||
libffi_basedir="${with_multisrctop}../"
|
||||
else
|
||||
libffi_basedir="${with_multisrctop}"
|
||||
fi
|
||||
|
@ -186,7 +186,7 @@ AC_OUTPUT(include/Makefile include/ffi.h Makefile,
|
|||
[
|
||||
if test -n "$CONFIG_FILES"; then
|
||||
LD="${ORIGINAL_LD_FOR_MULTILIBS}"
|
||||
ac_file=Makefile . ${srcdir}/${libffi_basedir}/../config-ml.in
|
||||
ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in
|
||||
fi
|
||||
],
|
||||
srcdir=${srcdir}
|
||||
|
|
Loading…
Add table
Reference in a new issue