[PATCH] fix subtle flex problems on MacOS

[David Ostrovsky]

Change-Id: Id3d8313eabcef926b3ab3c121597f7b8cb5e0124
---
 l10ntools/source/cfglex.l   |    1 +
 l10ntools/source/srclex.l   |    1 +
 l10ntools/source/xrmlex.l   |    1 +
 solenv/gbuild/LinkTarget.mk |    2 +-
 4 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/l10ntools/source/cfglex.l b/l10ntools/source/cfglex.l
index e7d6b40..dda0246 100644
--- a/l10ntools/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -45,6 +45,7 @@ extern "C" FILE * init(int, char **);
 int bText=0;
 %}
 
+%option yylineno
 %option never-interactive
 
 %p 24000
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 38eb105..6001725 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -47,6 +47,7 @@ extern "C" void Close();
 void YYWarning();
 %}
 
+%option yylineno
 %option never-interactive
 
 %p 24000
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 500c1b9..5e00cc1 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -53,6 +53,7 @@ void YYWarning();
 int bText=0;
 %}
 
+%option yylineno
 %option never-interactive
 
 %p 24000
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 0fb8aef..c412d57 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -268,7 +268,7 @@ define gb_LexTarget__command
 $(call gb_Output_announce,$(2),$(true),LEX,3)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(3)) && \
-	$(FLEX) $(T_LEXFLAGS) -o $(4) $(1) && touch $(3) )
+	$(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) )
 endef
 
 
-- 
1.7.5.4


--------------040309040207040303090206--