mirror of
https://github.com/dunglas/frankenphp.git
synced 2025-12-24 13:38:11 +08:00
fix relative paths not being resolved correctly by spc (#2093)
closes #2092 closes #2064
This commit is contained in:
@@ -178,7 +178,11 @@ fi
|
|||||||
|
|
||||||
# Embed PHP app, if any
|
# Embed PHP app, if any
|
||||||
if [ -n "${EMBED}" ] && [ -d "${EMBED}" ]; then
|
if [ -n "${EMBED}" ] && [ -d "${EMBED}" ]; then
|
||||||
SPC_OPT_BUILD_ARGS="${SPC_OPT_BUILD_ARGS} --with-frankenphp-app=${EMBED}"
|
if [[ "${EMBED}" != /* ]]; then
|
||||||
|
EMBED="${CURRENT_DIR}/${EMBED}"
|
||||||
|
fi
|
||||||
|
# shellcheck disable=SC2089
|
||||||
|
SPC_OPT_BUILD_ARGS="${SPC_OPT_BUILD_ARGS} --with-frankenphp-app='${EMBED}'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SPC_OPT_INSTALL_ARGS="go-xcaddy"
|
SPC_OPT_INSTALL_ARGS="go-xcaddy"
|
||||||
@@ -204,7 +208,7 @@ done
|
|||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
${spcCommand} download --with-php="${PHP_VERSION}" --for-extensions="${PHP_EXTENSIONS}" --for-libs="${PHP_EXTENSION_LIBS}" ${SPC_OPT_DOWNLOAD_ARGS}
|
${spcCommand} download --with-php="${PHP_VERSION}" --for-extensions="${PHP_EXTENSIONS}" --for-libs="${PHP_EXTENSION_LIBS}" ${SPC_OPT_DOWNLOAD_ARGS}
|
||||||
export FRANKENPHP_SOURCE_PATH="${CURRENT_DIR}"
|
export FRANKENPHP_SOURCE_PATH="${CURRENT_DIR}"
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086,SC2090
|
||||||
${spcCommand} build --enable-zts --build-embed --build-frankenphp ${SPC_OPT_BUILD_ARGS} "${PHP_EXTENSIONS}" --with-libs="${PHP_EXTENSION_LIBS}"
|
${spcCommand} build --enable-zts --build-embed --build-frankenphp ${SPC_OPT_BUILD_ARGS} "${PHP_EXTENSIONS}" --with-libs="${PHP_EXTENSION_LIBS}"
|
||||||
|
|
||||||
if [ -n "$CI" ]; then
|
if [ -n "$CI" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user