Skip to content

Commit 6d26d64

Browse files
committed
Improve cross-compiling for ttyname_r check
1 parent 18d49d1 commit 6d26d64

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

cmake/cmake/modules/PHP/CheckTtynameR.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ cmake_push_check_state(RESET)
4545

4646
if(NOT _HAVE_TTYNAME_R)
4747
message(CHECK_FAIL "no (non-standard declaration)")
48-
elseif(CMAKE_CROSSCOMPILING AND _HAVE_TTYNAME_R)
48+
elseif(
49+
NOT DEFINED HAVE_TTYNAME_R
50+
CMAKE_CROSSCOMPILING
51+
NOT CMAKE_CROSSCOMPILING_EMULATOR
52+
AND _HAVE_TTYNAME_R
53+
)
4954
set(HAVE_TTYNAME_R TRUE CACHE INTERNAL "Whether ttyname_r() works.")
5055
message(CHECK_PASS "guessing yes (cross-compiling)")
5156
else()

cmake/cmake/toolchains/template.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,6 @@ set(ZEND_MM_OUTPUT "(size_t)8 (size_t)3 0")
5757

5858
# Set to exit code of the stack limit check.
5959
set(ZEND_CHECK_STACK_LIMIT_EXITCODE 1)
60+
61+
# Set to exit code of the ttyname_r check.
62+
set(HAVE_TTYNAME_R_EXITCODE 0)

0 commit comments

Comments
 (0)