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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@271640 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 7f668945952ac9878aedb7d186cc3c506d686683..ba9550787afd01e01e18b0fdef8c2bcd7bb7149f 100644 (file)
--- 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 888b6d96bc2215ebc7cdaa8626cbd70a0b701554..1e33a5769e0d9ba3f5fe324b0ec2a0420620231a 100755 (executable)
--- 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 c47253b28f358b14ea510de3261234223f4dab0a..0bd328c618b255aa09d4389eb5c37180ea631efa 100644 (file)
--- 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