Skip to content

Commit

Permalink
Do not set CC/CXX/cmake variables (#5434)
Browse files Browse the repository at this point in the history
Modify `bootstrap` script to not set compiler, since cmake can do the
same.

---
TYPE: NO_HISTORY
DESC: Do not set CC/CXX variables

Co-authored-by: Dušan Baran <me.dusanbaran@gmail.com>
  • Loading branch information
dudoslav and Dušan Baran authored Jan 28, 2025
1 parent 02808ba commit 2d43272
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -196,26 +196,9 @@ if [ "${linkage}" = "shared" ] && [ "${enable_static_tiledb}" = "ON" ]; then
die "cannot specify both --linkage=shared and --enable-static-tiledb"
fi

# Check clang compiler
if [[ x"${CC}" = x"" ]]; then
CC=gcc
fi

if [[ x"${CXX}" = x"" ]]; then
CXX=g++
fi

cmake=`which cmake`

if [[ ! -x ${cmake} ]]; then
die "cannot find cmake"
fi

# Configure
${cmake} -DCMAKE_BUILD_TYPE=${build_type} \
cmake -DCMAKE_BUILD_TYPE=${build_type} \
-DCMAKE_INSTALL_PREFIX="${prefix_dirs}" \
-DCMAKE_C_COMPILER="${CC}" \
-DCMAKE_CXX_COMPILER="${CXX}" \
-DCMAKE_PREFIX_PATH="${dependency_dir}" \
-DBUILD_SHARED_LIBS=${build_shared_libs} \
-DTILEDB_ASSERTIONS=${tiledb_assertions} \
Expand Down

0 comments on commit 2d43272

Please sign in to comment.