Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion .evergreen/scripts/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ cmake_flags=(
-DENABLE_UNINSTALL=ON
)

# System-installed libmongoc must not prevent fetch-and-build of libmongoc.
if [[ -z "$(find "${mongoc_prefix:?}" -name 'bson-config.h')" ]]; then
cmake_flags+=("-DCMAKE_DISABLE_FIND_PACKAGE_mongoc-1.0=ON")
fi

_RUN_DISTCHECK=""
case "${OSTYPE:?}" in
cygwin)
Expand Down Expand Up @@ -271,7 +276,7 @@ if [[ -n "$(find "${mongoc_prefix:?}" -name 'bson-config.h')" ]]; then
exit 1
}
fi
else
elif [[ -n "$(find install -name 'bson-config.h')" ]]; then
if [[ "${BSON_EXTRA_ALIGNMENT:-}" == "1" ]]; then
grep -R "#define BSON_EXTRA_ALIGN 1" install || {
echo "BSON_EXTRA_ALIGN is not 1 despite BSON_EXTRA_ALIGNMENT=1" 1>&2
Expand All @@ -283,4 +288,7 @@ else
exit 1
}
fi
else
echo "unexpectedly compiled using a system libmongoc library" 1>&2
exit 1
fi