Skip to content

build_static_lib and build use same build output dir #404

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.

Sign up for GitHub

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 3 commits into from
Oct 22, 2025
+15 −4
Merged

build_static_lib and build use same build output dir #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ed8126
test: fix static build
wudidapaopao Oct 20, 2025
5288d3c
test: fix static build
wudidapaopao Oct 20, 2025
7a08189
Merge branch 'main' into fix_static_build
wudidapaopao Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion chdb/build/build_static_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

. ${MY_DIR}/../vars.sh

BUILD_DIR=${PROJ_DIR}/build-static-lib
if [ "$(uname)" == "Darwin" ] && [ "$(uname -m)" == "x86_64" ]; then
BUILD_DIR=${PROJ_DIR}/buildlib
else
BUILD_DIR=${PROJ_DIR}/build-static-lib
fi

HDFS="-DENABLE_HDFS=1 -DENABLE_GSASL_LIBRARY=1 -DENABLE_KRB5=1"
MYSQL="-DENABLE_MYSQL=1"
Expand Down
13 changes: 10 additions & 3 deletions chdb/build/create_static_libchdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,16 @@ def parse_libchdb_cmd():
script_dir = os.path.dirname(os.path.abspath(__file__))
project_root = os.path.dirname(os.path.dirname(script_dir))

if IS_MACOS_X86:
build_dir = 'buildlib'
else:
build_dir = 'build-static-lib'

print(f"Using build directory: {build_dir}")

# First, check build.log to see if it contains @CMakeFiles/clickhouse.rsp
build_log_path = os.path.join(project_root, 'build-static-lib', 'build.log')
rsp_file_path = os.path.join(project_root, 'build-static-lib', 'CMakeFiles', 'clickhouse.rsp')
build_log_path = os.path.join(project_root, build_dir, 'build.log')
rsp_file_path = os.path.join(project_root, build_dir, 'CMakeFiles', 'clickhouse.rsp')

command = ""
use_rsp_file = False
Expand Down Expand Up @@ -68,7 +75,7 @@ def parse_libchdb_cmd():
print("=== END COMMAND ===\n")

# Common prefix for absolute paths
base_path = os.path.join(project_root, "build-static-lib")
base_path = os.path.join(project_root, build_dir)

# Extract all .o files and .a files from the command
# Pattern for .o files (must be followed by space or end of string)
Expand Down
Loading