diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2024-08-02 09:47:14 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2024-08-02 09:59:59 +0300 |
| commit | 7d4535be64fde4963aa2ddd389134facac293e87 (patch) | |
| tree | a62e08ab207b1a4b2c110abaae19bf08f4a3af7e /contrib/tools | |
| parent | 361db6f916e56c2f127232d0260fcc910f2527b9 (diff) | |
| download | ydb-7d4535be64fde4963aa2ddd389134facac293e87.tar.gz | |
contrib/tools/bison: Replace patch with environment variable
59fef9fd4f33196d66de3ac1fba18aba86a7f327
Diffstat (limited to 'contrib/tools')
| -rw-r--r-- | contrib/tools/bison/lib/config-win.h | 1 | ||||
| -rw-r--r-- | contrib/tools/bison/src/getargs.c | 8 | ||||
| -rw-r--r-- | contrib/tools/bison/src/getargs.h | 2 | ||||
| -rw-r--r-- | contrib/tools/bison/src/output.c | 3 |
4 files changed, 1 insertions, 13 deletions
diff --git a/contrib/tools/bison/lib/config-win.h b/contrib/tools/bison/lib/config-win.h index 4e3fc4ebfa..a3a4ad1ade 100644 --- a/contrib/tools/bison/lib/config-win.h +++ b/contrib/tools/bison/lib/config-win.h @@ -1701,6 +1701,7 @@ char *strsignal (int signum); /* Define as a macro for copying va_list variables. */ #define va_copy gl_va_copy +#define M4 "/var/empty/gnum4-1.4.19/bin/m4" #define M4_GNU_OPTION "--gnu" #define PACKAGE_COPYRIGHT_YEAR 2013 #define _GL_ATTRIBUTE_MALLOC diff --git a/contrib/tools/bison/src/getargs.c b/contrib/tools/bison/src/getargs.c index 51d66be3f5..417e163c2a 100644 --- a/contrib/tools/bison/src/getargs.c +++ b/contrib/tools/bison/src/getargs.c @@ -65,8 +65,6 @@ const char *skeleton = NULL; int language_prio = default_prio; struct bison_language const *language = &valid_languages[0]; -const char* m4_path = NULL; - /** Decode an option's key. * * \param opt option being decoded. @@ -496,7 +494,6 @@ enum LOCATIONS_OPTION = CHAR_MAX + 1, PRINT_LOCALEDIR_OPTION, PRINT_DATADIR_OPTION, - M4_PATH, REPORT_FILE_OPTION }; @@ -525,7 +522,6 @@ static struct option const long_options[] = /* Hidden. */ { "trace", optional_argument, 0, 'T' }, - { "m4", required_argument, 0, M4_PATH }, /* Output. */ { "defines", optional_argument, 0, 'd' }, @@ -734,10 +730,6 @@ getargs (int argc, char *argv[]) spec_verbose_file = xstrdup (AS_FILE_NAME (optarg)); break; - case M4_PATH: - m4_path = xstrdup (AS_FILE_NAME (optarg)); - break; - default: usage (EXIT_FAILURE); } diff --git a/contrib/tools/bison/src/getargs.h b/contrib/tools/bison/src/getargs.h index b488091393..c5adb8487a 100644 --- a/contrib/tools/bison/src/getargs.h +++ b/contrib/tools/bison/src/getargs.h @@ -42,8 +42,6 @@ extern bool token_table_flag; /* for -k */ extern location yacc_loc; /* for -y */ extern bool update_flag; /* for -u */ -extern const char* m4_path; - /* GLR_PARSER is true if the input file says to use the GLR (Generalized LR) parser, and to output some additional information used by the GLR algorithm. */ diff --git a/contrib/tools/bison/src/output.c b/contrib/tools/bison/src/output.c index ae0dc5834f..10a6d38a7a 100644 --- a/contrib/tools/bison/src/output.c +++ b/contrib/tools/bison/src/output.c @@ -48,9 +48,6 @@ #include <contrib/tools/bison/arcadia_root.h> -#undef M4 -#define M4 (m4_path) - #define STR(a) XSTR(a) #define XSTR(a) #a |