Skip to content

Commit 3bce795

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 5928660 + ce31c5c commit 3bce795

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

CMakeLists.txt

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,31 +72,9 @@ project(
7272
VERSION 8.4
7373
DESCRIPTION "CMake-based PHP build system"
7474
HOMEPAGE_URL "https://github.com/petk/php-build-system"
75-
LANGUAGES C
75+
LANGUAGES NONE
7676
)
7777

78-
################################################################################
79-
# Configure languages.
80-
################################################################################
81-
82-
# Optionally enable C++ language for PHP extensions.
83-
include(CheckLanguage)
84-
check_language(CXX)
85-
if(CMAKE_CXX_COMPILER)
86-
enable_language(CXX)
87-
endif()
88-
89-
# Enable Assembly language dialect.
90-
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
91-
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^ARM")
92-
enable_language(ASM_MARMASM)
93-
else()
94-
enable_language(ASM_MASM)
95-
endif()
96-
else()
97-
enable_language(ASM)
98-
endif()
99-
10078
# Configuration.
10179
block(PROPAGATE phpUrl)
10280
set(

cmake/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ define_property(
8080
# Check whether IPO/LTO can be enabled.
8181
include(PHP/Optimization)
8282

83+
# Enable position-independent code (PIC) for all targets and
84+
# position-independent executables (PIE) for executable targets.
85+
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
8386
include(CheckPIESupported)
8487
check_pie_supported()
8588

cmake/cmake/CMakeDefaults.cmake

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,3 @@ mark_as_advanced(CMAKE_COMPILE_WARNING_AS_ERROR)
4747
# Set default visibility of all symbols to hidden if the compiler (for example,
4848
# GCC >= 4) supports it. This can help reduce the binary size and startup time.
4949
set(CMAKE_C_VISIBILITY_PRESET "hidden")
50-
51-
# Enable position-independent code (PIC) for all targets.
52-
if(NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
53-
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
54-
endif()

0 commit comments

Comments
 (0)