mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 12:03:41 +08:00
Provide AC_PROG_LEX that copes with LEX=missing from top-level
config/ PR binutils/19481 * override.m4 (AC_PROG_LEX): Define. binutils/ * configure: Regenerate. gas/ * configure: Regenerate. ld/ * configure: Regenerate.
This commit is contained in:
parent
eb0edac83f
commit
3d961d0d3a
@ -1,3 +1,7 @@
|
||||
2016-01-18 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
||||
2016-01-17 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
9
binutils/configure
vendored
9
binutils/configure
vendored
@ -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
|
||||
|
@ -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
|
||||
|
@ -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])
|
||||
|
||||
])
|
||||
|
@ -1,3 +1,7 @@
|
||||
2016-01-18 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
||||
2016-01-17 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
9
gas/configure
vendored
9
gas/configure
vendored
@ -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
|
||||
|
@ -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
|
||||
|
9
ld/configure
vendored
9
ld/configure
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user