Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jingjingxyk committed Aug 9, 2024
2 parents 513e7da + 08fa4b9 commit 6e1e88f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
10 changes: 1 addition & 9 deletions prepare.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,10 @@


$c_compiler = $p->getInputOption('with-c-compiler');
if ($c_compiler == 'musl-gcc') {
$p->set_C_COMPILER('musl-gcc');
$p->set_CXX_COMPILER('g++');
$p->setLinker('ld');
} elseif ($c_compiler == 'gcc') {
if ($c_compiler == 'gcc') {
$p->set_C_COMPILER('gcc');
$p->set_CXX_COMPILER('g++');
$p->setLinker('ld');
} elseif ($c_compiler == 'x86_64-linux-musl-gcc') {
$p->set_C_COMPILER('x86_64-linux-musl-gcc');
$p->set_CXX_COMPILER('x86_64-linux-musl-g++');
$p->setLinker('ld');
}

if ($p->getInputOption('with-build-shared-lib')) {
Expand Down
4 changes: 4 additions & 0 deletions sapi/quickstart/clean-folder-for-extra-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ test -f setup-supervisord.sh && rm -rf setup-supervisord.sh
test -f setup-swoole-cli-pre-runtime.sh && rm -rf setup-swoole-cli-pre-runtime.sh
test -f setup-webBenchmark-runtime.sh && rm -rf setup-webBenchmark-runtime.sh
test -f setup-swow-cli-runtime.sh && rm -rf setup-swow-cli-runtime.sh
test -f setup-php-fpm-7.4-runtime.sh && rm -rf setup-php-fpm-7.4-runtime.sh
test -f setup-swoole-cli-runtime.sh && rm -rf setup-swoole-cli-runtime.sh
test -f setup-php-cli-7.4-runtime.sh && rm -rf setup-php-cli-7.4-runtime.sh
test -f setup-php-cli-7.3-runtime.sh && rm -rf setup-php-cli-7.3-runtime.sh


cd ${__PROJECT__}
Expand Down
5 changes: 5 additions & 0 deletions sapi/quickstart/linux/extra/archlinux-php-init.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pacman -Sy --noconfirm git curl wget openssl which
pacman -Sy --noconfirm cmake autoconf libtool make gcc
pacman -Sy --noconfirm pkg-config unixodbc c-are
pacman -Sy --noconfirm extra/php
pacman -Sy --noconfirm extra/php-redis extra/php-pgsql extra/php-sqlite
2 changes: 1 addition & 1 deletion setup-php-runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ case $ARCH in
'x86_64')
ARCH="x64"
;;
'aarch64' | 'arm64' )
'aarch64' | 'arm64')
ARCH="arm64"
;;
*)
Expand Down

0 comments on commit 6e1e88f

Please sign in to comment.