Skip to content

PCBC-1053: Fix CC compiler flags bleeding into CMAKE_C_COMPILER on macOS #251

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
avsej merged 1 commit into from
Mar 27, 2026
Merged

PCBC-1053: Fix CC compiler flags bleeding into CMAKE_C_COMPILER on macOS #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Makefile.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ $(COUCHBASE_CMAKE_BUILD_DIRECTORY)/CMakeCache.txt: $(COUCHBASE_CMAKE_SOURCE_DIRE
-S $(COUCHBASE_CMAKE_SOURCE_DIRECTORY) \
-B $(COUCHBASE_CMAKE_BUILD_DIRECTORY) \
-DCMAKE_BUILD_TYPE=$(if $(COUCHBASE_CMAKE_BUILD_TYPE),$(COUCHBASE_CMAKE_BUILD_TYPE),$(COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE)) \
-DCMAKE_C_COMPILER="$(CC)" \
-DCMAKE_CXX_COMPILER="$(CXX)" \
-DCMAKE_C_COMPILER="$(CC_PATH)" \
-DCMAKE_CXX_COMPILER="$(CXX_PATH)" \
-DCMAKE_C_FLAGS="$(COMMON_FLAGS)" \
-DCMAKE_CXX_FLAGS="$(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)" \
-DCOUCHBASE_ABI_VERSION="$(CB_ABI_VERSION)" \
Expand Down
17 changes: 17 additions & 0 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,26 @@ if test "$PHP_COUCHBASE" != "no"; then
fi
AC_MSG_NOTICE([Detected C++ compiler: $CXX_PATH])

# Similarly, CC may have flags concatenated into it (e.g. "cc -std=gnu23").
# Strip them so CMake receives a bare compiler path in CMAKE_C_COMPILER.
AC_CHECK_FILE([$CC], [CC_PATH=$CC], [CC_PATH=no])
if test "$CC_PATH" = "no"; then
AC_MSG_NOTICE([PHP suggested C compiler, which includes flags "$CC", trying to strip them])
CC_PATH=$(echo "$CC" | cut -d' ' -f1)
AC_CHECK_FILE([$CC_PATH], [], [CC_PATH=no])
if test "$CC_PATH" == "no"; then
AC_MSG_NOTICE([Unable to locate path to C compiler, falling back to "cc"])
AC_SUBST([CC_PATH], [cc])
fi
fi
AC_MSG_NOTICE([Detected C compiler: $CC_PATH])

AC_PATH_PROG(CMAKE, cmake, no)
if ! test -x "${CMAKE}"; then
AC_MSG_ERROR(Please install cmake to build couchbase extension)
fi

CC="${CC_PATH}"
CXX="${CXX_PATH}"
CXXFLAGS="${CXXFLAGS} -std=c++17"
COUCHBASE_CMAKE_SOURCE_DIRECTORY="$srcdir/src"
Expand All @@ -41,6 +56,8 @@ if test "$PHP_COUCHBASE" != "no"; then
fi

PHP_SUBST([CMAKE])
PHP_SUBST([CC_PATH])
PHP_SUBST([CXX_PATH])
PHP_SUBST([COUCHBASE_CMAKE_SOURCE_DIRECTORY])
PHP_SUBST([COUCHBASE_CMAKE_BUILD_DIRECTORY])
PHP_SUBST([COUCHBASE_DEFAULT_CMAKE_BUILD_TYPE])
Expand Down
Loading