arm64 fixes
This commit is contained in:
@@ -34,6 +34,7 @@ if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
|
|||||||
-t ${DOCKER_TAG} . || exit 1
|
-t ${DOCKER_TAG} . || exit 1
|
||||||
else
|
else
|
||||||
docker build ${APP_VERSION_BUILD_ARGS} \
|
docker build ${APP_VERSION_BUILD_ARGS} \
|
||||||
|
--platform linux/amd64 \
|
||||||
--build-arg C_STANDARD=${PROJECT_C_STANDARD} \
|
--build-arg C_STANDARD=${PROJECT_C_STANDARD} \
|
||||||
--build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
|
--build-arg CXX_STANDARD=${PROJECT_CXX_STANDARD} \
|
||||||
--build-arg NUM_JOBS=${NUM_JOBS} \
|
--build-arg NUM_JOBS=${NUM_JOBS} \
|
||||||
|
|||||||
2
support/3rd_party/icu_configure.sh
vendored
2
support/3rd_party/icu_configure.sh
vendored
@@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
if [ "$(uname -m)" == "arm64" ] &&
|
if ([ "$(uname -m)" == "arm64" ] || [ "$(uname -m)" == "aarch64" ]) &&
|
||||||
[ "${PROJECT_IS_ARM64}" == "0" ]; then
|
[ "${PROJECT_IS_ARM64}" == "0" ]; then
|
||||||
HOST_CFG="--host=x86_64-apple-darwin"
|
HOST_CFG="--host=x86_64-apple-darwin"
|
||||||
export CC="clang -arch x86_64"
|
export CC="clang -arch x86_64"
|
||||||
|
|||||||
Reference in New Issue
Block a user