Skip to content

Commit c89986a

Browse files
committed
Merge branch 'PHP-8.4'
2 parents ff91766 + d34d664 commit c89986a

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

cmake/Zend/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ include(CMakeDependentOption)
5757
include(CMakePushCheckState)
5858
include(FeatureSummary)
5959
include(PHP/AddCustomCommand)
60+
include(PHP/SearchLibraries)
6061

6162
################################################################################
6263
# Configuration.
@@ -557,6 +558,14 @@ include(cmake/CheckFloatPrecision.cmake)
557558
# Check for strerror_r, and if its a POSIX-compatible or a GNU-specific version.
558559
include(cmake/CheckStrerrorR.cmake)
559560

561+
# Check for Solaris/illumos process mapping.
562+
php_search_libraries(
563+
Pgrab
564+
HEADERS libproc.h
565+
LIBRARIES proc
566+
TARGET zend PRIVATE
567+
)
568+
560569
################################################################################
561570
# Generate lexers and parsers.
562571
################################################################################

cmake/cmake/ConfigureChecks.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -655,14 +655,6 @@ php_search_libraries(
655655
TARGET php_configuration INTERFACE
656656
)
657657

658-
# Check for Solaris/illumos process mapping.
659-
php_search_libraries(
660-
Pgrab
661-
HEADERS libproc.h
662-
LIBRARIES proc
663-
TARGET php_configuration INTERFACE
664-
)
665-
666658
# The gai_strerror() is mostly in C library (Solaris 11.4...)
667659
php_search_libraries(
668660
gai_strerror

0 commit comments

Comments
 (0)