aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-05-27 00:14:02 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-05-27 00:14:02 +0000
commit8b9cfd766d1de5e8b0409e4a475730c9a79da5ea (patch)
tree0bb1a5d4fd97da26567e4edcb58143ee57d6fce2
parent8b33101442a91db2a9c083e6844177ccbb2d3d0b (diff)
downloadgcc-8b9cfd766d1de5e8b0409e4a475730c9a79da5ea.zip
gcc-8b9cfd766d1de5e8b0409e4a475730c9a79da5ea.tar.gz
gcc-8b9cfd766d1de5e8b0409e4a475730c9a79da5ea.tar.bz2
re PR go/90635 (typo in libgo/configure.ac)
PR go/90635 libgo: correct typo in USE_LIBFFI AM_CONDITIONAL Only affects the case of passing --without-libffi to configure. Fixes https://gcc.gnu.org/PR90635 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/178998 From-SVN: r271640
-rw-r--r--gcc/go/gofrontend/MERGE2
-rwxr-xr-xlibgo/configure2
-rw-r--r--libgo/configure.ac2
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 7f66894..ba95507 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-578c4fb6132801db8e9d11d741d2394e07c5a398
+3995d545f1e112c682753f342eaef0877551a649
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/configure b/libgo/configure
index 888b6d9..1e33a57 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13712,7 +13712,7 @@ $as_echo "#define USE_LIBFFI 1" >>confdefs.h
fi
- if test "$with_liffi" != "no"; then
+ if test "$with_libffi" != "no"; then
USE_LIBFFI_TRUE=
USE_LIBFFI_FALSE='#'
else
diff --git a/libgo/configure.ac b/libgo/configure.ac
index c47253b..0bd328c 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -128,7 +128,7 @@ if test "$with_libffi" != no; then
fi
AC_SUBST(LIBFFI)
AC_SUBST(LIBFFIINCS)
-AM_CONDITIONAL(USE_LIBFFI, test "$with_liffi" != "no")
+AM_CONDITIONAL(USE_LIBFFI, test "$with_libffi" != "no")
# See if the user wants to configure without libatomic. This is useful if we are
# on an architecture for which libgo does not need an atomic support library and