diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-15 22:40:26 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-03-15 23:11:33 -0400 |
| commit | f63423d58551b387dd9617c6c84719a95ee6d522 (patch) | |
| tree | ff298570ee2c1fe5d6168f622d70c7057c1362ee /connectivity | |
| parent | d02f456d02e1c92f6fa0a5402c18cd2409e43f91 (diff) | |
Revert "cleanup sqlflex and sqlbison options"
This reverts commit b659d7c33fcacdbbef86557e78f071abf94bead2.
That commit appears to have broken the build on Linux. Reverting it
fixes it.
Change-Id: I70d62c04e9fb284ed2c360c0976d0cbeafc2ddc2
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/Library_dbtools.mk | 10 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlbison.y | 4 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlflex.l | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 4228eb9b4b42..1e063eacd2a9 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -66,6 +66,8 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ )) endif +#connectivity/source/commontools/RowFunctionParser.cxx disable optimization? + $(eval $(call gb_Library_add_noexception_objects,dbtools,\ connectivity/source/simpledbt/refbase \ )) @@ -74,10 +76,16 @@ $(eval $(call gb_Library_add_grammars,dbtools,\ connectivity/source/parse/sqlbison \ )) +$(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison) : T_YACCFLAGS := -d -l -pSQLyy -bsql + $(eval $(call gb_Library_add_scanners,dbtools,\ - connectivity/source/parse/sqlflex \ +connectivity/source/parse/sqlflex \ )) +$(call gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) : T_LEXFLAGS := -i -8 -PSQLyy -L + + + $(eval $(call gb_Library_add_exception_objects,dbtools,\ connectivity/source/commontools/AutoRetrievingBase \ connectivity/source/commontools/BlobHelper \ diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 017428b3a8aa..0bb7c316e1a4 100644 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -1,8 +1,4 @@ %token-table -%defines -%no-lines -%define api.prefix SQLyy -%file-prefix "sql" %{ /* * This file is part of the LibreOffice project. diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 1ded0e2d2e74..d17128ec64a9 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -1,6 +1,3 @@ -%option case-insensitive -%option 8bit -%option prefix="SQLyy" %{ // |