From 125919295dd1e9acdef8560f961ed3642f89eb52 Mon Sep 17 00:00:00 2001 From: Xiaotian Wu Date: Sat, 12 Mar 2022 13:14:30 +0800 Subject: [PATCH] Remove -Werror to use a later version of the toolchain --- deps/easy/CMakeLists.txt | 2 +- src/sql/parser/gen_parser.sh | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/deps/easy/CMakeLists.txt b/deps/easy/CMakeLists.txt index eb64d7306..2850c41ca 100644 --- a/deps/easy/CMakeLists.txt +++ b/deps/easy/CMakeLists.txt @@ -51,7 +51,7 @@ target_compile_options(easy_base INTERFACE -D_GLIBCXX_USE_CXX11_ABI=0 -D_GNU_SOURCE -D__STDC_LIMIT_MACROS ${MARCH_CFLAGS} ${MTUNE_CFLAGS} - $<$:-g -Wall -Werror -fPIC ${EASY_CC_WNO}> + $<$:-g -Wall -fPIC ${EASY_CC_WNO}> ) target_link_libraries(easy_base diff --git a/src/sql/parser/gen_parser.sh b/src/sql/parser/gen_parser.sh index 9e914335d..5230e2079 100755 --- a/src/sql/parser/gen_parser.sh +++ b/src/sql/parser/gen_parser.sh @@ -15,9 +15,13 @@ TEMP_FILE=$(mktemp) BISON_VERSION=`bison -V| grep 'bison (GNU Bison)'|awk '{ print $4;}'` NEED_VERSION='2.4.1' -if [ "$BISON_VERSION" != "$NEED_VERSION" ]; then - echo "bison version not match, please use bison-$NEED_VERSION" - exit 1 +# generate sql_parser +bison -v -d ../../../src/sql/parser/sql_parser_mysql_mode.y -o ../../../src/sql/parser/sql_parser_mysql_mode_tab.c +BISON_RETURN="$?" +if [ $BISON_RETURN -ne 0 ] +then + echo Compile error[$BISON_RETURN], abort. + exit 1 fi cat ../../../src/sql/parser/sql_parser_mysql_mode.y >> $TEMP_FILE