aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binutils/ChangeLog4
-rwxr-xr-xbinutils/configure9
-rw-r--r--config/ChangeLog5
-rw-r--r--config/override.m412
-rw-r--r--gas/ChangeLog4
-rwxr-xr-xgas/configure9
-rw-r--r--ld/ChangeLog4
-rwxr-xr-xld/configure9
8 files changed, 44 insertions, 12 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 97dc361..c5b52f4 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-18 Alan Modra <amodra@gmail.com>
+
+ * configure: Regenerate.
+
2016-01-17 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/binutils/configure b/binutils/configure
index e1452e3..dc735dc 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -12112,8 +12112,9 @@ fi
done
test -n "$LEX" || LEX=":"
-if test "x$LEX" != "x:"; then
- cat >conftest.l <<_ACEOF
+case "$LEX" in
+ :|*"missing "*) ;;
+ *) cat >conftest.l <<_ACEOF
%%
a { ECHO; }
b { REJECT; }
@@ -12224,8 +12225,8 @@ $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
+ ;;
+esac
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
diff --git a/config/ChangeLog b/config/ChangeLog
index d115579..bb77be0 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-18 Alan Modra <amodra@gmail.com>
+
+ PR binutils/19481
+ * override.m4 (AC_PROG_LEX): Define.
+
2015-10-21 Maxim Ostapenko <m.ostapenko@partner.samsung.com>
* bootstrap-asan.mk: Replace ASAN_OPTIONS=detect_leaks with
diff --git a/config/override.m4 b/config/override.m4
index 52bd1c3..b5ce654 100644
--- a/config/override.m4
+++ b/config/override.m4
@@ -101,4 +101,16 @@ m4_define([_AC_CHECK_DECLS],
])
+dnl If flex/lex are not found, the top level configure sets LEX to
+dnl "/path_to/missing flex". When AC_PROG_LEX tries to find the flex
+dnl output file, it calls $LEX to do so, but the current lightweight
+dnl "missing" won't create a file. This results in an error.
+dnl Avoid calling the bulk of AC_PROG_LEX when $LEX is "missing".
+AC_DEFUN_ONCE([AC_PROG_LEX],
+[AC_CHECK_PROGS(LEX, flex lex, :)
+case "$LEX" in
+ :|*"missing "*) ;;
+ *) _AC_PROG_LEX_YYTEXT_DECL ;;
+esac])
+
])
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 38ccec5..1c0e224 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-18 Alan Modra <amodra@gmail.com>
+
+ * configure: Regenerate.
+
2016-01-17 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/gas/configure b/gas/configure
index ceb99f5..c69edf5 100755
--- a/gas/configure
+++ b/gas/configure
@@ -12862,8 +12862,9 @@ fi
done
test -n "$LEX" || LEX=":"
-if test "x$LEX" != "x:"; then
- cat >conftest.l <<_ACEOF
+case "$LEX" in
+ :|*"missing "*) ;;
+ *) cat >conftest.l <<_ACEOF
%%
a { ECHO; }
b { REJECT; }
@@ -12974,8 +12975,8 @@ $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
+ ;;
+esac
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
diff --git a/ld/ChangeLog b/ld/ChangeLog
index ba6c463..b99b170 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-18 Alan Modra <amodra@gmail.com>
+
+ * configure: Regenerate.
+
2016-01-18 Nick Clifton <nickc@redhat.com>
* testsuite/ld-plugin/plugin.exp: Skip plugin tests if the linker
diff --git a/ld/configure b/ld/configure
index 65b280c..2141ee7 100755
--- a/ld/configure
+++ b/ld/configure
@@ -16130,8 +16130,9 @@ fi
done
test -n "$LEX" || LEX=":"
-if test "x$LEX" != "x:"; then
- cat >conftest.l <<_ACEOF
+case "$LEX" in
+ :|*"missing "*) ;;
+ *) cat >conftest.l <<_ACEOF
%%
a { ECHO; }
b { REJECT; }
@@ -16242,8 +16243,8 @@ $as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
-fi
+ ;;
+esac
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi