Skip to content

cmake-env.mk: Allow using BUILD_SHARED_LIBS and fix legacy behavior #6784

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 1 commit into from
Nov 9, 2025
Merged

cmake-env.mk: Allow using BUILD_SHARED_LIBS and fix legacy behavior #6784

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: 3 additions & 1 deletion mk/spksrc.cross-cmake-env.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ CMAKE_INSTALL_RPATH_USE_LINK_PATH = TRUE
CMAKE_BUILD_WITH_INSTALL_RPATH = TRUE

# Allow building shared libraries to be manually set
ifeq ($(filter -DBUILD_SHARED_LIBS%,$(CMAKE_ARGS)),)
ifeq ($(or $(filter -DBUILD_SHARED_LIBS%,$(CMAKE_ARGS)),$(strip $(BUILD_SHARED_LIBS))),)
BUILD_SHARED_LIBS = ON
endif

Expand All @@ -61,8 +61,10 @@ CMAKE_ARGS += -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=$(CMAKE_FIND_ROOT_PATH_MODE_PR
CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(CMAKE_INSTALL_RPATH)
CMAKE_ARGS += -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=$(CMAKE_INSTALL_RPATH_USE_LINK_PATH)
CMAKE_ARGS += -DCMAKE_BUILD_WITH_INSTALL_RPATH=$(CMAKE_BUILD_WITH_INSTALL_RPATH)
ifneq ($(strip $(BUILD_SHARED_LIBS)),)
CMAKE_ARGS += -DBUILD_SHARED_LIBS=$(BUILD_SHARED_LIBS)
endif
endif

# Use native cmake (latest stable)
ifeq ($(strip $(USE_NATIVE_CMAKE)),1)
Expand Down