Skip to content

Commit 04cefda

Browse files
authored
Merge pull request #774 from crazywhalecc/fix/arm64-musl
ah, the infamous arm64 bug with -fpic vs -fPIC
2 parents 0d3a80e + 8c6a708 commit 04cefda

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

config/env.ini

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ CXX=${SPC_LINUX_DEFAULT_CXX}
6868
AR=${SPC_LINUX_DEFAULT_AR}
6969
LD=ld.gold
7070
; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
71-
SPC_DEFAULT_C_FLAGS="-fpic -Os"
72-
SPC_DEFAULT_CXX_FLAGS="-fpic -Os"
71+
SPC_DEFAULT_C_FLAGS="-fPIC -Os"
72+
SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
7373
; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
7474
SPC_EXTRA_LIBS=
7575
; upx executable path
@@ -89,15 +89,15 @@ SPC_CMD_VAR_PHP_EMBED_TYPE="static"
8989

9090
; *** default build vars for building php ***
9191
; CFLAGS for configuring php
92-
SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fpie"
92+
SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fPIE"
9393
; CPPFLAGS for configuring php
9494
SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}"
9595
; LDFLAGS for configuring php
9696
SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
9797
; LIBS for configuring php
9898
SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lpthread -lm"
9999
; EXTRA_CFLAGS for `make` php
100-
SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fpie ${SPC_DEFAULT_C_FLAGS}"
100+
SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE ${SPC_DEFAULT_C_FLAGS}"
101101
; EXTRA_LIBS for `make` php
102102
SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm"
103103
; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so

0 commit comments

Comments
 (0)