diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2024-05-17 12:00:42 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2024-05-17 12:10:14 +0300 |
| commit | 2bd98b5c8ddd404f62db9f74144a763de01341cc (patch) | |
| tree | 93040aaeb1b7076ec9e3de486128f99b44316e7f /build | |
| parent | 3d339ed1c60a04d959a40aaa931e1792a1a9cabb (diff) | |
| download | ydb-2bd98b5c8ddd404f62db9f74144a763de01341cc.tar.gz | |
Sync contrib/tools/bison layout with upstream
59379f119eb5f2fd036edea64923ff53b96c9028
Diffstat (limited to 'build')
| -rw-r--r-- | build/conf/bison_lex.conf | 8 | ||||
| -rw-r--r-- | build/sysincl/misc.yml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/conf/bison_lex.conf b/build/conf/bison_lex.conf index 4fbce40991..96d3ff5ed8 100644 --- a/build/conf/bison_lex.conf +++ b/build/conf/bison_lex.conf @@ -6,7 +6,7 @@ LEX_FLAGS= BISON_FLAGS=-v -_BISON_DATA_DIR=contrib/tools/bison/bison/data +_BISON_DATA_DIR=contrib/tools/bison/data _CPP_BISON_SKELS=\ ${_BISON_DATA_DIR}/bison.m4 \ ${_BISON_DATA_DIR}/c++-skel.m4 \ @@ -132,13 +132,13 @@ macro USE_OLD_FLEX() { } macro _SRC("y", SRC, SRCFLAGS...) { - .PEERDIR=contrib/tools/bison/bison/induced - .CMD=${tool:"contrib/tools/bison/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP + .PEERDIR=contrib/tools/bison/induced + .CMD=${tool:"contrib/tools/bison"} $BISON_FLAGS --m4=${tool:"contrib/tools/bison/m4"} $_BISON_HEADER ${hide:_BISON_GEN_EXT} -o ${nopath;output;suf=$_BISON_GEN_EXT:SRC} ${input:SRC} ${SRCFLAGS} ${kv;hide:"p YC"} ${kv;hide:"pc light-green"} && $_BISON_PP .SEM=target_bison_parser PRIVATE ${input:SRC} ${output;nopath;noext;hide;suf=${OBJ_SUF}.o:SRC} ${nopath;noext;output;hide:SRC.h} ${nopath;noext;output;addincl;hide:SRC.h} && set_global_flags BISON_FLAGS $BISON_FLAGS && conan_require_tool m4/1.4.19 && conan_import '"bin, m4* -> ./bin/m4/bin"' && conan_require_tool bison/3.8.2 && conan_import '"bin, bison* -> ./bin/bison/bin"' && conan_import '"res, * -> ./bin/bison/res"' && platform_vars-BISON_FLAGS ${quo:BISON_FLAGS} && conan-tool_requires m4/1.4.19 && conan-imports 'bin, m4* -> ./bin/m4/bin' && conan-tool_requires bison/3.8.2 && conan-imports 'bin, bison* -> ./bin/bison/bin' && conan-imports 'res, * -> ./bin/bison/res' } macro _SRC("ypp", SRC, SRCFLAGS...) { - .PEERDIR=contrib/tools/bison/bison/induced + .PEERDIR=contrib/tools/bison/induced .CMD=$_SRC(y $SRC $SRCFLAGS) .SEM=$_SRC(y $SRC $SRCFLAGS) } diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml index 66261fdcca..e4143a0564 100644 --- a/build/sysincl/misc.yml +++ b/build/sysincl/misc.yml @@ -504,7 +504,7 @@ - contrib/libs/glibcasm/glibc/include/stdint.h - contrib/libs/cxxsupp/libcxx/include/stdint.h -- source_filter: "^contrib/tools/bison/bison/data" +- source_filter: "^contrib/tools/bison/data" includes: - position.hh |