diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e10d806..bc51b47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -321,7 +321,7 @@ jobs: run: | git clone --depth 1 --branch OpenSSL_1_1_1k https://github.com/openssl/openssl.git cd openssl - ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./config ${{ matrix.arch_name.openssl_arg }} + ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./Configure ${{ matrix.arch_name.openssl_arg }} ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2 - name: deploy if: github.ref == 'refs/heads/master' diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in index 65b4d06..4ddcba1 100644 --- a/android-arm/Dockerfile.in +++ b/android-arm/Dockerfile.in @@ -17,6 +17,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \ ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23 +ENV ANDROID_NDK_HOME ${CROSS_ROOT} RUN mkdir -p /build && \ cd /build && \ diff --git a/android-arm64/Dockerfile.in b/android-arm64/Dockerfile.in index 6cbbedf..ce9bbfc 100644 --- a/android-arm64/Dockerfile.in +++ b/android-arm64/Dockerfile.in @@ -21,6 +21,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \ ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23 +ENV ANDROID_NDK_HOME ${CROSS_ROOT} RUN mkdir -p /build && \ cd /build && \ diff --git a/android-x86/Dockerfile b/android-x86/Dockerfile index e4f31a7..3287e86 100644 --- a/android-x86/Dockerfile +++ b/android-x86/Dockerfile @@ -12,6 +12,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \ ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23 +ENV ANDROID_NDK_HOME ${CROSS_ROOT} RUN mkdir -p /build && \ cd /build && \ diff --git a/android-x86_64/Dockerfile b/android-x86_64/Dockerfile index 0ac2690..826a730 100644 --- a/android-x86_64/Dockerfile +++ b/android-x86_64/Dockerfile @@ -12,6 +12,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \ ENV ANDROID_NDK_REVISION 23 ENV ANDROID_NDK_API 23 +ENV ANDROID_NDK_HOME ${CROSS_ROOT} RUN mkdir -p /build && \ cd /build && \ diff --git a/tools/dockcross-cmake-builder.sh b/tools/dockcross-cmake-builder.sh index 6aa2072..7b9e5f3 100755 --- a/tools/dockcross-cmake-builder.sh +++ b/tools/dockcross-cmake-builder.sh @@ -16,7 +16,7 @@ if (( $# >= 1 )); then chmod +x ./dockcross-"$image" echo "Build $build_file" - ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja "$cmake_arg" + ./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg ./dockcross-"$image" ninja -C "$build_file" else echo "Usage: ${0##*/} " diff --git a/tools/dockcross-command.sh b/tools/dockcross-command.sh index 5eb544b..12859a4 100755 --- a/tools/dockcross-command.sh +++ b/tools/dockcross-command.sh @@ -15,7 +15,7 @@ if (( $# >= 2 )); then chmod +x ./dockcross-"$image" echo "Run command in dockcross-$image" - ./dockcross-"$image" "$command" + ./dockcross-"$image" $command else echo "Usage: ${0##*/} " exit 1 diff --git a/tools/dockcross-make-builder.sh b/tools/dockcross-make-builder.sh index 2f45d81..1bd2171 100755 --- a/tools/dockcross-make-builder.sh +++ b/tools/dockcross-make-builder.sh @@ -16,7 +16,7 @@ if (( $# >= 1 )); then chmod +x ./dockcross-"$image" echo "Build $build_file" - ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg" + ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} ' $make_arg else echo "Usage: ${0##*/} " exit 1