Skip to content

Commit 57f6da7

Browse files
committed
Single minimal_build config and update building docs
1 parent 04198cf commit 57f6da7

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

‎ci/scripts/cpp_test.sh‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,8 @@ if [ "${ARROW_USE_MESON:-OFF}" = "OFF" ] && \
147147
-S "${source_dir}/examples/minimal_build" \
148148
-B "${build_dir}/examples/minimal_build" \
149149
-DARROW_EXAMPLE_S3_STATIC_CHECK=ON \
150-
-DARROW_EXAMPLE_GCS_STATIC_CHECK=OFF \
150+
-DARROW_EXAMPLE_GCS_STATIC_CHECK=ON \
151151
-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
152-
# Check S3 before discovering GCS dependencies
153-
cmake --build "${build_dir}/examples/minimal_build"
154-
cmake -S "${source_dir}/examples/minimal_build" \
155-
-B "${build_dir}/examples/minimal_build" \
156-
-DARROW_EXAMPLE_GCS_STATIC_CHECK=ON
157152
cmake --build "${build_dir}/examples/minimal_build"
158153
pushd "${source_dir}/examples/minimal_build"
159154
# PATH= is for Windows.

‎docs/source/developers/cpp/building.rst‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ downloading them (one for each build dir!).
600600
Statically Linking
601601
------------------
602602

603-
When ``-DARROW_BUILD_STATIC=ON``, all build dependencies built as static
603+
When ``-DARROW_BUILD_STATIC=ON``, core build dependencies built as static
604604
libraries by the Arrow build system will be merged together to create a static
605605
library ``arrow_bundled_dependencies``. In UNIX-like environments (Linux, macOS,
606606
MinGW), this is called ``libarrow_bundled_dependencies.a`` and on Windows with
@@ -614,6 +614,10 @@ an `example CMake-based build configuration
614614
<https://github.com/apache/arrow/tree/main/cpp/examples/minimal_build>`_ to
615615
show you a working example.
616616

617+
With ``-DARROW_GCS=ON``, a bundled google-cloud-cpp goes into a separate
618+
``arrow_gcs_bundled_dependencies`` library. The ``ArrowGcs::arrow_gcs_static``
619+
CMake target includes it automatically, otherwise link it right after ``arrow_gcs``.
620+
617621
On Linux and macOS, if your application does not link to the ``pthread``
618622
library already, you must include ``-pthread`` in your linker setup. In CMake
619623
this can be accomplished with the ``Threads`` built-in package:

0 commit comments

Comments
 (0)