Skip to content

Commit 19d00a0

Browse files
authored
fix relative paths not being resolved correctly by spc (#2093)
closes #2092 closes #2064
1 parent 57c58fa commit 19d00a0

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

build-static.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,11 @@ fi
178178

179179
# Embed PHP app, if any
180180
if [ -n "${EMBED}" ] && [ -d "${EMBED}" ]; then
181-
SPC_OPT_BUILD_ARGS="${SPC_OPT_BUILD_ARGS} --with-frankenphp-app=${EMBED}"
181+
if [[ "${EMBED}" != /* ]]; then
182+
EMBED="${CURRENT_DIR}/${EMBED}"
183+
fi
184+
# shellcheck disable=SC2089
185+
SPC_OPT_BUILD_ARGS="${SPC_OPT_BUILD_ARGS} --with-frankenphp-app='${EMBED}'"
182186
fi
183187

184188
SPC_OPT_INSTALL_ARGS="go-xcaddy"
@@ -204,7 +208,7 @@ done
204208
# shellcheck disable=SC2086
205209
${spcCommand} download --with-php="${PHP_VERSION}" --for-extensions="${PHP_EXTENSIONS}" --for-libs="${PHP_EXTENSION_LIBS}" ${SPC_OPT_DOWNLOAD_ARGS}
206210
export FRANKENPHP_SOURCE_PATH="${CURRENT_DIR}"
207-
# shellcheck disable=SC2086
211+
# shellcheck disable=SC2086,SC2090
208212
${spcCommand} build --enable-zts --build-embed --build-frankenphp ${SPC_OPT_BUILD_ARGS} "${PHP_EXTENSIONS}" --with-libs="${PHP_EXTENSION_LIBS}"
209213

210214
if [ -n "$CI" ]; then

0 commit comments

Comments
 (0)