Skip to content

Library import 5, delete go dependencies #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 12 additions & 5 deletions build/conf/bison_lex.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,20 @@ _CPP_BISON_SKELS=\
_BISON_GEN_EXT=.cpp
_FLEX_GEN_EXT=.cpp

_BISON_HEADER=--defines=${nopath;noext;output;main;addincl;norel;suf=.h:SRC}
_BISON_PP=$YMAKE_PYTHON ${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) ${nopath;noext;tmp:SRC.h}

_FLEX_TOOL=${tool:"contrib/tools/flex-old"}
_FLEX_TOOL_DIR=contrib/tools/flex-old
_BISON_HEADER=
_BISON_PP=
_FLEX_TOOL=
_FLEX_TOOL_DIR=
_FLEX_HEADER=

when ($_BISON_FLEX_SET_DEFAULTS == "yes") {
_BISON_HEADER=--defines=${nopath;noext;output;main;addincl;norel;suf=.h:SRC}
_BISON_PP=$YMAKE_PYTHON ${input:"build/scripts/preprocess.py"} $_ADD_HIDDEN_INPUTS($_CPP_BISON_SKELS) ${nopath;noext;tmp:SRC.h}
_FLEX_TOOL=${tool:"contrib/tools/flex-old"}
_FLEX_TOOL_DIR=contrib/tools/flex-old
_FLEX_HEADER=
}

### @usage: FLEX_FLAGS(<flags>)
###
### Set flags for Lex tool (flex) invocations.
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/clang_tidy.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def ensure_clean_dir(path):
"-p",
compile_command_path,
"--warnings-as-errors",
"*",
"*,-clang-diagnostic-#pragma-messages",
"--config-file",
result_config_file,
"--header-filter",
Expand Down
1 change: 1 addition & 0 deletions build/ymake.core.conf
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,7 @@ module _BASE_UNIT: _BARE_UNIT {
}

ENABLE(USE_YASM_ASSEMBLER)
ENABLE(_BISON_FLEX_SET_DEFAULTS)
}

_LINKER_ID=
Expand Down
10 changes: 6 additions & 4 deletions build/ymake_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ def __init__(self, name, os, arch):
self.is_riscv32 = self.is_rv32imc

self.is_nds32 = self.arch in ('nds32le_elf_mculib_v5f',)
self.is_tc32 = self.arch in ('tc32_elf',)

self.is_xtensa = self.arch in ('xtensa_hifi5',)

Expand All @@ -100,7 +101,7 @@ def __init__(self, name, os, arch):
self.is_wasm64 = self.arch == 'wasm64'
self.is_wasm = self.is_wasm64

self.is_32_bit = self.is_x86 or self.is_armv7 or self.is_armv8m or self.is_riscv32 or self.is_nds32 or self.is_armv7em or self.is_xtensa
self.is_32_bit = self.is_x86 or self.is_armv7 or self.is_armv8m or self.is_riscv32 or self.is_nds32 or self.is_armv7em or self.is_xtensa or self.is_tc32
self.is_64_bit = self.is_x86_64 or self.is_armv8 or self.is_powerpc or self.is_wasm64

assert self.is_32_bit or self.is_64_bit
Expand Down Expand Up @@ -183,6 +184,7 @@ def arch_variables(self):
(self.is_riscv32, 'ARCH_RISCV32'),
(self.is_xtensa, 'ARCH_XTENSA'),
(self.is_nds32, 'ARCH_NDS32'),
(self.is_tc32, 'ARCH_TC32'),
(self.is_wasm64, 'ARCH_WASM64'),
(self.is_32_bit, 'ARCH_TYPE_32'),
(self.is_64_bit, 'ARCH_TYPE_64'),
Expand Down Expand Up @@ -1047,7 +1049,7 @@ def __init__(self, build, detector):

self.os_sdk_local = False

if build.target.is_apple and to_bool(preset('APPLE_SDK_LOCAL'), default=False):
if build.host.is_apple and build.target.is_apple and to_bool(preset('APPLE_SDK_LOCAL'), default=False):
self.os_sdk_local = True

if self.os_sdk == 'local':
Expand Down Expand Up @@ -1406,8 +1408,8 @@ def __init__(self, tc, build):
'-fdebug-default-version=4',
]
elif self.tc.is_gcc:
if self.target.is_xtensa:
# Xtensa toolchain does not support this flag
if self.target.is_xtensa or self.target.is_tc32:
# Xtensa and tc32 toolchains does not support this flag
pass
else:
self.c_foptions += [
Expand Down
158 changes: 0 additions & 158 deletions contrib/clickhouse/base/base/BorrowedObjectPool.h

This file was deleted.

14 changes: 0 additions & 14 deletions contrib/clickhouse/base/base/DayNum.h

This file was deleted.

Loading